From 2f82ff5b7bdd59c9fe20f100f861b6bc1c513270 Mon Sep 17 00:00:00 2001 From: Tomi Korpipaa Date: Mon, 23 Apr 2018 09:00:54 +0300 Subject: Disable manipulator tools for camera objects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QT3DS-1034 Change-Id: Ief6e1388dec758ff8f875fc71b48369c07910856 Reviewed-by: Mahmoud Badri Reviewed-by: Marianne Yrjänä Reviewed-by: Miikka Heikkinen --- src/Authoring/Studio/Render/StudioRendererTranslation.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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(theTranslator->GetGraphObject())); SCamera *theRenderCamera = m_Context.GetRenderer().GetCameraForNode(theNode); bool isActiveCamera = theRenderCamera == (static_cast(&theNode)); - if (shouldDisplayWidget && isActiveCamera == false) { + if (shouldDisplayWidget && isActiveCamera == false + && theTranslator->GetGraphObject().m_Type != GraphObjectTypes::Camera) { switch (theToolMode) { default: QT3DS_ASSERT(false); -- cgit v1.2.3