Merge remote-tracking branch 'origin/master' into 1.9
# Conflicts: # Source/Engine/UI/GUI/Common/Button.cs
This commit is contained in:
@@ -74,6 +74,7 @@ namespace FlaxEditor.Surface
|
||||
Visible = false,
|
||||
Parent = this,
|
||||
EndEditOnClick = false, // We have to handle this ourselves, otherwise the textbox instantly loses focus when double-clicking the header
|
||||
HorizontalAlignment = TextAlignment.Center,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -448,6 +448,8 @@ namespace FlaxEditor.Surface
|
||||
sb.Append("virtual ");
|
||||
sb.Append(valueType.Name);
|
||||
sb.Append(' ');
|
||||
if (member.IsMethod)
|
||||
sb.Append(member.DeclaringType.Namespace).Append('.');
|
||||
sb.Append(declaringType.Name);
|
||||
sb.Append('.');
|
||||
sb.Append(name);
|
||||
|
||||
@@ -140,12 +140,12 @@ namespace FlaxEditor.Surface
|
||||
var searchStartTime = DateTime.Now;
|
||||
#endif
|
||||
|
||||
foreach (var scriptType in Editor.Instance.CodeEditing.All.Get())
|
||||
foreach (var scriptType in Editor.Instance.CodeEditing.AllWithStd.Get())
|
||||
{
|
||||
if (!SurfaceUtils.IsValidVisualScriptType(scriptType))
|
||||
continue;
|
||||
|
||||
_iterator(scriptType, _cache, _version);
|
||||
if (SurfaceUtils.IsValidVisualScriptType(scriptType))
|
||||
{
|
||||
_iterator(scriptType, _cache, _version);
|
||||
}
|
||||
}
|
||||
|
||||
// Add group to context menu (on a main thread)
|
||||
|
||||
@@ -17,7 +17,6 @@ using FlaxEditor.Surface.Elements;
|
||||
using FlaxEngine;
|
||||
using FlaxEngine.GUI;
|
||||
using FlaxEngine.Utilities;
|
||||
using Object = FlaxEngine.Object;
|
||||
|
||||
namespace FlaxEditor.Surface
|
||||
{
|
||||
@@ -36,6 +35,14 @@ namespace FlaxEditor.Surface
|
||||
Archetypes = new List<NodeArchetype>(),
|
||||
};
|
||||
|
||||
private static readonly string[] _blacklistedTypeNames =
|
||||
{
|
||||
"Newtonsoft.Json.",
|
||||
"System.Array",
|
||||
"System.Linq.Expressions.",
|
||||
"System.Reflection.",
|
||||
};
|
||||
|
||||
private static NodesCache _nodesCache = new NodesCache(IterateNodesCache);
|
||||
private DragActors _dragActors;
|
||||
|
||||
@@ -269,8 +276,11 @@ namespace FlaxEditor.Surface
|
||||
{
|
||||
// Skip Newtonsoft.Json stuff
|
||||
var scriptTypeTypeName = scriptType.TypeName;
|
||||
if (scriptTypeTypeName.StartsWith("Newtonsoft.Json."))
|
||||
return;
|
||||
for (var i = 0; i < _blacklistedTypeNames.Length; i++)
|
||||
{
|
||||
if (scriptTypeTypeName.StartsWith(_blacklistedTypeNames[i]))
|
||||
return;
|
||||
}
|
||||
var scriptTypeName = scriptType.Name;
|
||||
|
||||
// Enum
|
||||
|
||||
Reference in New Issue
Block a user