diff options
Diffstat (limited to 'src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp')
-rw-r--r-- | src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp index 1723976d..eeaeda66 100644 --- a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp +++ b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp @@ -323,6 +323,9 @@ qt3dsdm::Qt3DSDMPropertyHandle CClientDataModelBridge::getVariantsProperty(int i if (instanceType == OBJTYPE_GROUP) return m_Group.m_variants; + if (instanceType == OBJTYPE_COMPONENT) + return m_Component.m_variants; + return 0; } @@ -1737,12 +1740,8 @@ CClientDataModelBridge::GetObjectType(qt3dsdm::Qt3DSDMInstanceHandle inInstance) return OBJTYPE_SUBPATH; else if (theType == L"Lightmaps") return OBJTYPE_LIGHTMAPS; - else if (theType == L"Action") - return OBJTYPE_UNKNOWN; - else { - ASSERT(0); - return OBJTYPE_UNKNOWN; - } + + return OBJTYPE_UNKNOWN; } bool CClientDataModelBridge::IsBehaviorInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const |