summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp')
-rw-r--r--src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp
index 3e1f16c0..7d39ab97 100644
--- a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp
@@ -1592,10 +1592,10 @@ bool CClientDataModelBridge::CanDelete(qt3dsdm::Qt3DSDMInstanceHandle inInstance
case OBJTYPE_SUBPATH:
case OBJTYPE_EFFECT:
return !IsLockedAtAll(inInstance);
- break;
+
case OBJTYPE_COMPONENT:
return !IsLockedAtAll(inInstance) && !IsActiveComponent(inInstance);
- break;
+
case OBJTYPE_LAYER:
// We could not delete a layer if
// 1. if the deleted layer is in master slide, and there is only 1 master layer
@@ -1617,18 +1617,17 @@ bool CClientDataModelBridge::CanDelete(qt3dsdm::Qt3DSDMInstanceHandle inInstance
}
return !IsLockedAtAll(inInstance);
- break;
+
case OBJTYPE_BEHAVIOR:
return true;
- break;
+
case OBJTYPE_MATERIAL:
case OBJTYPE_LIGHTMAPS:
case OBJTYPE_SCENE:
return false;
- break;
+
default:
return false;
- break;
}
}