Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' of git://github.com/Polypulse/FlaxEngine into Polypulse-master

Browse Source
This commit is contained in:
Wojciech Figat
2020-12-28 22:11:47 +01:00
parent 140fae3fa1 aff2c154a9
commit 9a9996bd51
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Editor/CustomEditors/Editors/TypeEditor.cs
+1 -1
View File
@@ -405,7 +405,7 @@ namespace FlaxEditor.CustomEditors.Editors
if (_element.CustomControl.Type == new ScriptType(typeof(object)))
{
_element.CustomControl.Type = Values.Type.Type != typeof(object) || Values[0] == null ? Values.Type : TypeUtils.GetObjectType(Values[0]);
_element.CustomControl.Type = Values.Type.Type != typeof(object) || Values[0] == null ? new ScriptType(typeof(object)) : TypeUtils.GetObjectType(Values[0]);
}
}
}