diff options
| author | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2018-11-27 16:13:22 +0200 |
|---|---|---|
| committer | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2018-11-27 14:58:47 +0000 |
| commit | 0874a716139539864fba445863ef762a2a87576e (patch) | |
| tree | 8f138456534e4936abdc4c597eb5a117ff1bddd6 /src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp | |
| parent | c9213ac236306faa957f4829d1fabb917bcc1126 (diff) | |
Disable unlinking of basic material properties
Task-number: QT3DS-2750
Change-Id: Id301d9775f2d102911bcc3696dd55d0cfee9d6e5
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp')
| -rw-r--r-- | src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp index 49b4e373..f9dedc12 100644 --- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp @@ -257,8 +257,10 @@ QString InspectorControlView::noneString() const bool InspectorControlView::canLinkProperty(int instance, int handle) const { CDoc *doc = g_StudioApp.GetCore()->GetDoc(); - EStudioObjectType type = doc->GetStudioSystem()->GetClientDataModelBridge() - ->GetObjectType(instance); + const auto bridge = doc->GetStudioSystem()->GetClientDataModelBridge(); + if (bridge->isInsideMaterialContainer(instance)) + return false; + EStudioObjectType type = bridge->GetObjectType(instance); if (!qt3dsdm::Qt3DSDMPropertyHandle(handle).Valid() && (type & (OBJTYPE_CUSTOMMATERIAL | OBJTYPE_MATERIAL | OBJTYPE_REFERENCEDMATERIAL))) { return false; |