GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix structure initialization with default field value if attribute has different value HasInvalidPathChar

Browse Source 
#688
This commit is contained in:
Wojtek Figat
2022-02-06 22:44:40 +01:00
parent 73976149da
commit 3feeec1649
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Editor/Utilities/Utils.cs
View File

@@ -829,7 +829,13 @@ namespace FlaxEditor.Utilities
var attr = field.GetAttribute<System.ComponentModel.DefaultValueAttribute>();
if (attr != null)
{
field.SetValue(obj, attr.Value);
// Prevent value type conflicts
var value = attr.Value;
var fieldType = field.ValueType.Type;
if (value != null && value.GetType() != fieldType)
value = Convert.ChangeType(value, fieldType);
field.SetValue(obj, value);
}
else if (isStructure)
{
@@ -845,7 +851,13 @@ namespace FlaxEditor.Utilities
var attr = property.GetAttribute<System.ComponentModel.DefaultValueAttribute>();
if (attr != null)
{
property.SetValue(obj, attr.Value);
// Prevent value type conflicts
var value = attr.Value;
var propertyType = property.ValueType.Type;
if (value != null && value.GetType() != propertyType)
value = Convert.ChangeType(value, propertyType);
property.SetValue(obj, value);
}
}
}