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

Handle edge case

Browse Source
This commit is contained in:
Chandler Cox
2023-07-15 10:27:59 -05:00
parent c8edaf5d6e
commit 02219beac9
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Editor/CustomEditors/Editors/ModelInstanceEntryEditor.cs
View File

@@ -40,7 +40,7 @@ namespace FlaxEditor.CustomEditors.Editors
var matContainer = new CustomValueContainer(new ScriptType(typeof(MaterialBase)), _material, (instance, index) => _material, (instance, index, value) => _material = value as MaterialBase);
var materialEditor = (_group.Property(materiaLabel, matContainer)) as AssetRefEditor;
materialEditor.Values.SetDefaultValue(staticModel.Model.MaterialSlots[entryIndex].Material);
materialEditor.Values.SetDefaultValue((staticModel.Model.MaterialSlots[entryIndex].Material) ? staticModel.Model.MaterialSlots[entryIndex].Material : GPUDevice.Instance.DefaultMaterial);
materialEditor.RefreshDefaultValue();
materialEditor.Picker.SelectedItemChanged += () =>
{
@@ -54,6 +54,10 @@ namespace FlaxEditor.CustomEditors.Editors
{
staticModel.SetMaterial(entryIndex, null);
}
else if (material == GPUDevice.Instance.DefaultMaterial && !staticModel.Model.MaterialSlots[entryIndex].Material)
{
staticModel.SetMaterial(entryIndex, null);
}
else
{
staticModel.SetMaterial(entryIndex, material);
@@ -69,12 +73,9 @@ namespace FlaxEditor.CustomEditors.Editors
}
_material = animatedModel.GetMaterial(entryIndex);
var matContainer = new CustomValueContainer(new ScriptType(typeof(MaterialBase)), _material, (instance, index) => _material, (instance, index, value) =>
{
_material = value as MaterialBase;
});
var matContainer = new CustomValueContainer(new ScriptType(typeof(MaterialBase)), _material, (instance, index) => _material, (instance, index, value) => _material = value as MaterialBase);
var materialEditor = (_group.Property(materiaLabel, matContainer)) as AssetRefEditor;
materialEditor.Values.SetDefaultValue(animatedModel.SkinnedModel.MaterialSlots[entryIndex].Material);
materialEditor.Values.SetDefaultValue((animatedModel.SkinnedModel.MaterialSlots[entryIndex].Material) ? animatedModel.SkinnedModel.MaterialSlots[entryIndex].Material : GPUDevice.Instance.DefaultMaterial);
materialEditor.RefreshDefaultValue();
materialEditor.Picker.SelectedItemChanged += () =>
{
@@ -88,6 +89,10 @@ namespace FlaxEditor.CustomEditors.Editors
{
animatedModel.SetMaterial(entryIndex, null);
}
else if (material == GPUDevice.Instance.DefaultMaterial && !animatedModel.SkinnedModel.MaterialSlots[entryIndex].Material)
{
animatedModel.SetMaterial(entryIndex, null);
}
else
{
animatedModel.SetMaterial(entryIndex, material);