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

Fix bug with not using slot material

Browse Source
This commit is contained in:
Chandler Cox
2023-07-15 10:10:37 -05:00
parent ba93e1e1d0
commit c8edaf5d6e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@ namespace FlaxEditor.CustomEditors.Editors
staticModel.SetMaterial(entryIndex, GPUDevice.Instance.DefaultMaterial);
materialEditor.Picker.SelectedAsset = GPUDevice.Instance.DefaultMaterial;
}
else if (material == staticModel.Model.MaterialSlots[entryIndex])
else if (material == staticModel.Model.MaterialSlots[entryIndex].Material)
{
staticModel.SetMaterial(entryIndex, null);
}
@@ -84,7 +84,7 @@ namespace FlaxEditor.CustomEditors.Editors
animatedModel.SetMaterial(entryIndex, GPUDevice.Instance.DefaultMaterial);
materialEditor.Picker.SelectedAsset = GPUDevice.Instance.DefaultMaterial;
}
else if (material == animatedModel.SkinnedModel.MaterialSlots[entryIndex])
else if (material == animatedModel.SkinnedModel.MaterialSlots[entryIndex].Material)
{
animatedModel.SetMaterial(entryIndex, null);
}
@@ -112,6 +112,7 @@ namespace FlaxEditor.CustomEditors.Editors
/// <inheritdoc />
public override void Refresh()
{
Debug.Log("Hit");
if (_updateName &&
_group != null &&
ParentEditor?.ParentEditor != null &&