feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Turn the 3D edit light on initially for lightless scenes

Browse Source 
Change-Id: Ib840adec751604f08b5135b3e3088b7ce663685a
Fixes: QDS-2316
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Miikka Heikkinen
2020-06-29 16:24:07 +03:00
parent 28c6457b8c
commit 38ded4ffea
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml
View File

@@ -107,10 +107,22 @@ Item {
if (createEditView()) { if (createEditView()) {
if (activeScene) { if (activeScene) {
var toolStates = _generalHelper.getToolStates(sceneId); var toolStates = _generalHelper.getToolStates(sceneId);
if (Object.keys(toolStates).length > 0) if (Object.keys(toolStates).length > 0) {
updateToolStates(toolStates, true); updateToolStates(toolStates, true);
else } else {
// Don't inherit the edit light state from the previous scene, but rather
// turn the edit light on for scenes that do not have any scene
// lights, and turn it off for scenes that have.
var hasSceneLight = false;
for (var i = 0; i < lightIconGizmos.length; ++i) {
if (lightIconGizmos[i].scene === activeScene) {
hasSceneLight = true;
break;
}
}
showEditLight = !hasSceneLight;
storeCurrentToolStates(); storeCurrentToolStates();
}
} else { } else {
// When active scene is deleted, this function gets called by object deletion // When active scene is deleted, this function gets called by object deletion
// handlers without going through setActiveScene, so make sure sceneId is cleared. // handlers without going through setActiveScene, so make sure sceneId is cleared.