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

Fix materials parameters display issues after editing

Browse Source
This commit is contained in:
Wojtek Figat
2021-08-18 22:55:31 +02:00
parent 540643972a
commit fff2c3e038
5 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Editor/Windows/Assets/MaterialInstanceWindow.cs
View File

@@ -229,7 +229,7 @@ namespace FlaxEditor.Windows.Assets
layout.Label("No parameters");
return;
}
if (!materialInstance.IsLoaded || materialInstance.BaseMaterial && !materialInstance.BaseMaterial.IsLoaded)
if (!materialInstance.IsLoaded || (materialInstance.BaseMaterial && !materialInstance.BaseMaterial.IsLoaded))
{
layout.Label("Loading...");
return;
@@ -352,10 +352,9 @@ namespace FlaxEditor.Windows.Assets
};
// Material properties editor
_editor = new CustomEditorPresenter(_undo);
_editor = new CustomEditorPresenter(_undo, "Loading...");
_editor.Panel.Parent = _split.Panel2;
_properties = new PropertiesProxy();
_editor.Select(_properties);
_editor.Modified += OnMaterialPropertyEdited;
// Setup input actions
@@ -479,16 +478,11 @@ namespace FlaxEditor.Windows.Assets
/// <inheritdoc />
public override void Update(float deltaTime)
{
// Check if need to load
if (_isWaitingForLoad && _asset.IsLoaded && (_asset.BaseMaterial == null || _asset.BaseMaterial.IsLoaded))
{
// Clear flag
_isWaitingForLoad = false;
// Init material properties and parameters proxy
_properties.OnLoad(this);
// Setup
_editor.Select(_properties);
ClearEditedFlag();
_undo.Clear();
_editor.BuildLayout();