diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2018-05-14 12:41:25 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2018-05-14 10:41:47 +0000 |
| commit | 72014dc8a76a27c8a689184cb57fdc06f853c261 (patch) | |
| tree | a30ce70b61837aa52c2d2dbd01fb87e28bb23ea7 /src/Authoring/Studio/Palettes/Timeline | |
| parent | f99d72901a46539f6df66668d913deac1ec088ad (diff) | |
Revert alias duplicate
Also prevent user from adding Aliases via the Basic objects palette.
Task-number: QT3DS-1649
Change-Id: Ie3c7d8fee3f5fb875f78ee000956443295cb973b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Timeline')
| -rw-r--r-- | src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp index 9592b8ba..8f36c547 100644 --- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp +++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp @@ -589,7 +589,7 @@ bool Qt3DSDMTimelineItemBinding::IsValidTransaction(EUserTransaction inTransacti case EUserTransaction_Duplicate: if (theInstance.Valid()) - return m_StudioSystem->GetClientDataModelBridge()->isAliasable(theInstance); + return m_StudioSystem->GetClientDataModelBridge()->IsDuplicateable(theInstance); break; case EUserTransaction_Cut: @@ -677,7 +677,8 @@ void Qt3DSDMTimelineItemBinding::PerformTransaction(EUserTransaction inTransacti switch (inTransaction) { case EUserTransaction_Duplicate: { theDoc->DeselectAllKeyframes(); - theDoc->HandleDuplicateCommand(); + SCOPED_DOCUMENT_EDITOR(*theDoc, + QObject::tr("Duplicate Object"))->DuplicateInstances(theInstances); } break; case EUserTransaction_Cut: { theDispatch.FireOnAsynchronousCommand( |