diff options
| author | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2018-11-28 16:50:08 +0200 |
|---|---|---|
| committer | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2018-11-30 10:34:24 +0000 |
| commit | 1f226b9786aac4e1210b81ac1e67aed9cad9d948 (patch) | |
| tree | a508661e5646d790b534b43b517900441795ab3f /src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp | |
| parent | 580f0715ee1c292bf3c5104905187ecf11c82659 (diff) | |
Fix issues with material renaming
Disable basic material renaming by removing the name property from the
inspector, disabling rename from the timeline context menu and disabling
double clicking of the basic material in the timeline.
Refresh the inspector after rename to fix reverting to previous value.
Force a reference update after a rename by emitting assetNameChanged.
Task-number: QT3DS-2774
Change-Id: I4c1658ee8a4f206db90c46878e75cc0bb690956b
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp')
| -rw-r--r-- | src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp index e8b48a4d..47df8a27 100644 --- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp +++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp @@ -571,9 +571,12 @@ bool Qt3DSDMTimelineItemBinding::IsVisibleEnabled() const bool Qt3DSDMTimelineItemBinding::IsValidTransaction(EUserTransaction inTransaction) { qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance(); + const auto bridge = m_StudioSystem->GetClientDataModelBridge(); switch (inTransaction) { case EUserTransaction_Rename: - return (GetObjectType() != OBJTYPE_SCENE && GetObjectType() != OBJTYPE_IMAGE); + return (GetObjectType() != OBJTYPE_SCENE && GetObjectType() != OBJTYPE_IMAGE + && (bridge->GetObjectType(theInstance) != OBJTYPE_REFERENCEDMATERIAL + || bridge->GetSourcePath(theInstance).IsEmpty())); case EUserTransaction_Duplicate: if (theInstance.Valid()) |