diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2018-09-11 13:12:52 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2018-09-11 10:55:54 +0000 |
| commit | 2242866544e682b6d604b6540e2e7e5fa36f3153 (patch) | |
| tree | 74920080e88e805160207f6c9050dd39f5e652cc /src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp | |
| parent | 261ba65ad6497184dc77c1e49872d92884bb3f8b (diff) | |
Add Basic Properties to Material inspector
Task-number: QT3DS-2256
Change-Id: I8105f5554894c381db6dc52b2c9b22caf5bf34c5
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp')
| -rw-r--r-- | src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp index 289152db..d7ac3b60 100644 --- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp +++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp @@ -487,21 +487,21 @@ SComposerObjectDefinitions::SComposerObjectDefinitions( , m_Asset(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Guided, m_Named) , m_Scene(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset, m_SlideOwner) , m_Image(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) - , m_Lightmaps(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) - , m_MaterialBase(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Lightmaps) - , m_Material(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_MaterialBase) - , m_CustomMaterial(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_MaterialBase) - , m_ReferencedMaterial(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_MaterialBase) + , m_MaterialBase(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) + , m_Lightmaps(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_MaterialBase) + , m_Material(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Lightmaps) + , m_CustomMaterial(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Lightmaps) + , m_ReferencedMaterial(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Lightmaps) , m_Behavior(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) + , m_Effect(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) , m_Node(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) , m_Layer(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) - , m_Model(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) , m_Group(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) + , m_Model(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) , m_Light(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) , m_Camera(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) , m_Component(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node, m_SlideOwner) , m_Text(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) - , m_Effect(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) , m_RenderPlugin(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) , m_Alias(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) , m_Path(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) |