diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2019-06-03 14:00:07 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2019-06-03 14:01:18 +0300 |
| commit | 01cfc8025119609803b3fc00b1e8ca5bc56e84d0 (patch) | |
| tree | c41480bbb06377f3a79d13c465a53435cccb9de4 /src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h | |
| parent | c36739204786bd90df6e2ef5a8be78c980240bdd (diff) | |
| parent | 089d283afb8cde5024e60c29eeeeefc5c3c80543 (diff) | |
Merge branch '2.4'
Change-Id: Ib7de8e52a477c06599ced87bb973a5abd25549c4
Diffstat (limited to 'src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h')
| -rw-r--r-- | src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h index e2f12831..3063f047 100644 --- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h +++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h @@ -219,6 +219,7 @@ private: bool isBasicMaterial(CInspectableBase *inspectable) const; void updateMaterialValues(const QStringList &values, int elementIndex, bool updatingShaders = false); + qt3dsdm::Qt3DSDMInstanceHandle getReferenceMaterial(CInspectableBase *inspectable) const; void updateShaderValues(); void updateMatDataValues(); void updatePropertyValue(InspectorControlBase *element) const; |