summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2018-02-15 14:35:26 +0200
committerTomi Korpipää <tomi.korpipaa@qt.io>2018-02-16 04:28:20 +0000
commitd6f594359c29cd1f726a04350352a2d17255194c (patch)
tree63655e0db3dd67ea9cb53182f050d7044ee5815e
parent5425aeb25361d453868bb125ba8ac0a68b3b3306 (diff)
Disable 'make component' menu option for component elements
Making a component out of a component is redundant, so let's disable the option to do so. Task-number: QT3DS-1072 Change-Id: Ifdfba8d65b24fb9917d0f6d54dca5b8b1f33584e Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
index 1e8ef9d2..d1f881c6 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
@@ -603,6 +603,7 @@ bool Qt3DSDMTimelineItemBinding::IsValidTransaction(EUserTransaction inTransacti
if (theObjectType != OBJTYPE_LAYER && theObjectType != OBJTYPE_SCENE
&& theObjectType != OBJTYPE_MATERIAL && theObjectType != OBJTYPE_IMAGE
&& theObjectType != OBJTYPE_EFFECT && theObjectType != OBJTYPE_DATAINPUT
+ && theObjectType != OBJTYPE_COMPONENT
&& (theParentInstance.Valid()
&& theBridge->GetObjectType(theParentInstance)
!= OBJTYPE_SCENE)) // This checks if the object is