diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2018-05-11 10:14:54 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2018-05-11 08:14:25 +0000 |
| commit | d328bfd4f821e0319a71009dbbdb9d3fbe9e92b3 (patch) | |
| tree | 2f463e59317d48df157c2c506956b0ca438363cd /src/Authoring/Studio | |
| parent | da2bdeb80b9613087cddaaae53a7fce31943506e (diff) | |
Prevent alias duplicating Layers
Task-number: QT3DS-1604
Change-Id: I5c7b5bd888b25e3e6c2a74a0558561c4c383be10
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio')
| -rw-r--r-- | src/Authoring/Studio/Application/StudioApp.cpp | 6 | ||||
| -rw-r--r-- | src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Authoring/Studio/Application/StudioApp.cpp b/src/Authoring/Studio/Application/StudioApp.cpp index a08632dd..c3352606 100644 --- a/src/Authoring/Studio/Application/StudioApp.cpp +++ b/src/Authoring/Studio/Application/StudioApp.cpp @@ -1039,7 +1039,7 @@ void CStudioApp::DeleteSelectedObject() //============================================================================= /** - * Handles the duplicate object command + * Handles the alias duplicate object command */ void CStudioApp::HandleDuplicateCommand() { @@ -1048,7 +1048,7 @@ void CStudioApp::HandleDuplicateCommand() //============================================================================= /** - * return true if the selected object is duplicatable + * return true if the selected object is alias-duplicatable */ bool CStudioApp::CanDuplicateObject() { @@ -1058,7 +1058,7 @@ bool CStudioApp::CanDuplicateObject() return false; // Check if the object can be duplicated - return m_core->GetDoc()->GetStudioSystem()->GetClientDataModelBridge()->IsDuplicateable( + return m_core->GetDoc()->GetStudioSystem()->GetClientDataModelBridge()->isAliasable( theSelectedInstance); } diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp index 76d501ed..dd2989fa 100644 --- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp +++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp @@ -569,7 +569,7 @@ bool Qt3DSDMTimelineItemBinding::IsValidTransaction(EUserTransaction inTransacti case EUserTransaction_Duplicate: if (theInstance.Valid()) - return m_StudioSystem->GetClientDataModelBridge()->IsDuplicateable(theInstance); + return m_StudioSystem->GetClientDataModelBridge()->isAliasable(theInstance); break; case EUserTransaction_Cut: |