diff options
| author | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-09-04 09:50:26 +0300 |
|---|---|---|
| committer | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-09-04 10:59:50 +0300 |
| commit | 32a4774f6d838f019997dce0bef11b4c4b96eb4f (patch) | |
| tree | 2e1385ff41ff9051bf1a54f056f237e8a93d2da1 /src/Authoring/Qt3DStudio/Palettes | |
| parent | 616d5b27a994d94bbd665540c7ee4d94c2084777 (diff) | |
Fix inspector corruption for referenced materials
Material type list would be populated by the shader list for referenced
materials in some cases.
Task-number: QT3DS-3889
Change-Id: Ic5364369ae19753ef5bb3d682122aa6d5bcea9c1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Qt3DStudio/Palettes')
| -rw-r--r-- | src/Authoring/Qt3DStudio/Palettes/Inspector/InspectorControlModel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Authoring/Qt3DStudio/Palettes/Inspector/InspectorControlModel.cpp b/src/Authoring/Qt3DStudio/Palettes/Inspector/InspectorControlModel.cpp index cc093626..17fbb468 100644 --- a/src/Authoring/Qt3DStudio/Palettes/Inspector/InspectorControlModel.cpp +++ b/src/Authoring/Qt3DStudio/Palettes/Inspector/InspectorControlModel.cpp @@ -379,7 +379,7 @@ void InspectorControlModel::updateMaterialValues(const QStringList &values, int void InspectorControlModel::updateShaderValues() { int index = 0; - if (isAnimatableMaterial() && !isInsideMaterialContainer()) + if (!isInsideMaterialContainer()) index = 1; updateMaterialValues(shaderValues(), index, true); } @@ -403,7 +403,7 @@ void InspectorControlModel::setMaterials(std::vector<Q3DStudio::CFilePath> &mate m_materials.push_back({name, path.toQString()}); } - if (!isDefaultMaterial()) + if (isAnimatableMaterial() && !isDefaultMaterial()) updateShaderValues(); } |