summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Korpipaa <tomi.korpipaa@qt.io>2018-04-23 09:00:54 +0300
committerTomi Korpipää <tomi.korpipaa@qt.io>2018-04-23 06:53:26 +0000
commit2f82ff5b7bdd59c9fe20f100f861b6bc1c513270 (patch)
tree96e4f8e18b2b066a6cff518fef6ba9dfd01555f4
parent9d3f193509bf2c11273b264535e8dbcd22e92306 (diff)
Disable manipulator tools for camera objects
Task-number: QT3DS-1034 Change-Id: Ief6e1388dec758ff8f875fc71b48369c07910856 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--src/Authoring/Studio/Render/StudioRendererTranslation.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Render/StudioRendererTranslation.cpp b/src/Authoring/Studio/Render/StudioRendererTranslation.cpp
index 6ce0e260..6f992508 100644
--- a/src/Authoring/Studio/Render/StudioRendererTranslation.cpp
+++ b/src/Authoring/Studio/Render/StudioRendererTranslation.cpp
@@ -2377,7 +2377,8 @@ void STranslation::Render(int inWidgetId, bool inDrawGuides)
static_cast<qt3ds::render::SNode &>(theTranslator->GetGraphObject()));
SCamera *theRenderCamera = m_Context.GetRenderer().GetCameraForNode(theNode);
bool isActiveCamera = theRenderCamera == (static_cast<SCamera *>(&theNode));
- if (shouldDisplayWidget && isActiveCamera == false) {
+ if (shouldDisplayWidget && isActiveCamera == false
+ && theTranslator->GetGraphObject().m_Type != GraphObjectTypes::Camera) {
switch (theToolMode) {
default:
QT3DS_ASSERT(false);