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

Merge branch 'csharp_warning_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-csharp_warning_fix

Browse Source
This commit is contained in:
Wojtek Figat
2024-07-25 08:40:22 +02:00
parent 8397a81428 8b22ffe007
commit 7bb365c57b
5 changed files with 49 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Editor/Content/Import/TextureImportEntry.cs
View File

@@ -58,10 +58,10 @@ namespace FlaxEngine.Tools
FieldInfo[] fields = typeof(CustomMaxSizes).GetFields();
for (int i = 0; i < fields.Length; i++)
{
var field = fields[i];
if (field.Name.Equals("value__"))
var @field = fields[i];
if (@field.Name.Equals("value__"))
continue;
if (value == (int)field.GetRawConstantValue())
if (value == (int)@field.GetRawConstantValue())
return (CustomMaxSizes)value;
}
return CustomMaxSizes._8192;

6
Source/Editor/Scripting/ScriptType.cs
View File

@@ -51,12 +51,12 @@ namespace FlaxEditor.Scripting
int standardToken = _managed?.MetadataToken ?? _custom?.MetadataToken ?? 0;
if (_managed is PropertyInfo && _managed.DeclaringType != null)
{
var field = _managed.DeclaringType.GetField(string.Format("<{0}>k__BackingField", Name), BindingFlags.Instance | BindingFlags.NonPublic);
if (field == null || field.MetadataToken == 0)
var backingField = _managed.DeclaringType.GetField(string.Format("<{0}>k__BackingField", Name), BindingFlags.Instance | BindingFlags.NonPublic);
if (backingField == null || backingField.MetadataToken == 0)
{
return standardToken;
}
return field.MetadataToken;
return backingField.MetadataToken;
}
return standardToken;
}