summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-11-18 21:40:52 +0100
committerGitHub <noreply@github.com>2019-11-18 21:40:52 +0100
commitcc3b7d2ee2bcd0a4f8f88421fcdca6436b2416b1 (patch)
tree375a828aae9bcabf6fb8c720a7df1c9546a96f45
parent17ee8d0465726fc7b6b657a5d14bda46565edf33 (diff)
parent43d762fce363712000fd3ce3fc2b28eb91694637 (diff)
Merge pull request #33719 from KoBeWi/the_truth
Consider locked moving objects when updating viewport
-rw-r--r--editor/plugins/canvas_item_editor_plugin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index 7170ce30cc..13b2b7a6d4 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -3671,7 +3671,7 @@ void CanvasItemEditor::_notification(int p_what) {
int nb_having_pivot = 0;
// Update the viewport if the canvas_item changes
- List<CanvasItem *> selection = _get_edited_canvas_items();
+ List<CanvasItem *> selection = _get_edited_canvas_items(true);
for (List<CanvasItem *>::Element *E = selection.front(); E; E = E->next()) {
CanvasItem *canvas_item = E->get();
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(canvas_item);