diff options
| author | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-05-13 14:22:08 +0300 |
|---|---|---|
| committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-05-14 08:05:38 +0000 |
| commit | 3cad621f8b607eb915882caef5cbd439cfde26c5 (patch) | |
| tree | 0912fa0bd2c9bf0ed1ecc503dd0a3962c80fc1f1 /src/Authoring/Client/Code/Core | |
| parent | 787822c889744ae9cbd43e3824112f8905e8f746 (diff) | |
Support variants tags on Text objects
Task-number: QT3DS-3415
Change-Id: I6897133273a0c43fade6f564f4ea8d2e0347138d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Client/Code/Core')
3 files changed, 8 insertions, 4 deletions
diff --git a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp index f6a509dd..3e1f16c0 100644 --- a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp +++ b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp @@ -317,6 +317,9 @@ qt3dsdm::Qt3DSDMPropertyHandle CClientDataModelBridge::getVariantsProperty(int i if (instanceType == OBJTYPE_LAYER) return m_Layer.m_variants; + if (instanceType == OBJTYPE_TEXT) + return m_Text.m_variants; + if (instanceType == OBJTYPE_MODEL) return m_Model.m_variants; diff --git a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp index adf94ed1..07b24bc6 100644 --- a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp +++ b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp @@ -1612,10 +1612,10 @@ struct SComposerSerializerImpl : public IComposerSerializer IDOMWriter::Scope __instanceScope(inWriter, theType->wide_str()); inWriter.Att(L"id", GetInstanceId(inInstance)); - // For objects with a 'variants' property (layers, models, groups and components) save the - // variants property under the <Graph> node. + // For objects with a 'variants' property save the variants property under the <Graph> node. if (theType.getValue() == L"Layer" || theType.getValue() == L"Model" - || theType.getValue() == L"Group" || theType.getValue() == L"Component") { + || theType.getValue() == L"Text" || theType.getValue() == L"Group" + || theType.getValue() == L"Component") { auto prop = m_propertySystem.GetAggregateInstancePropertyByName(inInstance, L"variants"); SValue sVal; diff --git a/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.h b/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.h index f6a6fbdd..2b484190 100644 --- a/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.h +++ b/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.h @@ -69,7 +69,8 @@ enum EStudioObjectType { OBJTYPE_MATERIALDATA = 0x08000000, // filters - OBJTYPE_IS_VARIANT = OBJTYPE_LAYER | OBJTYPE_MODEL | OBJTYPE_GROUP | OBJTYPE_COMPONENT, + OBJTYPE_IS_VARIANT = OBJTYPE_LAYER | OBJTYPE_TEXT | OBJTYPE_MODEL | OBJTYPE_GROUP + | OBJTYPE_COMPONENT, OBJTYPE_IS_MATERIAL = OBJTYPE_MATERIAL | OBJTYPE_CUSTOMMATERIAL | OBJTYPE_REFERENCEDMATERIAL, OBJTYPE_IS_SINGULAR = OBJTYPE_SCENE | OBJTYPE_LAYER | OBJTYPE_BEHAVIOR | OBJTYPE_EFFECT | OBJTYPE_IS_MATERIAL, // Singular: cannot be multiselected |