diff options
| author | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-04-05 16:25:30 +0300 |
|---|---|---|
| committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-04-08 08:07:36 +0000 |
| commit | 133f2744eaa1bfa7066af377c442d59db1509dbb (patch) | |
| tree | eb7a4f4852f007cd6155b83c21cbe45bc2b74427 /src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp | |
| parent | 0c0c438384343148ac74dfe14e16a814d02936e4 (diff) | |
Support variants property on Group types
Also few usual cleanups.
Task-number: QT3DS-3234
Change-Id: I4624aeac27ee512cdbe62677bb9469e2748cc58b
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 | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp index 842a2884..41aa3365 100644 --- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp +++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp @@ -487,14 +487,8 @@ void ComposerTypeDefinitionsHelper::DeriveInstance(IDataCore &inDataCore, } // Container object for all of the object definitions -SComposerObjectDefinitions::SComposerObjectDefinitions( - IDataCore &inCore, - IMetaData &inMetaData /*, ISlideCore& inSlideCore, IPropertySystem& inPropertySystem*/) - : m_DataCore(inCore) - , m_MetaData(inMetaData) - //, m_SlideCore( inSlideCore ) - //, m_PropertySystem( inPropertySystem ) - , m_Typed(inCore, inMetaData, inCore.CreateInstance()) +SComposerObjectDefinitions::SComposerObjectDefinitions(IDataCore &inCore, IMetaData &inMetaData) + : m_Typed(inCore, inMetaData, inCore.CreateInstance()) , m_Guided(inCore, inMetaData, inCore.CreateInstance()) , m_Named(inCore, inMetaData, inCore.CreateInstance()) , m_SlideOwner(inCore, inMetaData, inCore.CreateInstance()) @@ -523,6 +517,7 @@ SComposerObjectDefinitions::SComposerObjectDefinitions( , m_Path(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) , m_PathAnchorPoint(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) , m_SubPath(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) + , m_DataCore(inCore) { } |