aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Haas2017-01-29 14:32:23 +0100
committerRémi Verschelde2017-03-18 19:54:51 +0100
commit6fb2abc7d8329e64658dd281c4c0b6e90dd756e5 (patch)
tree9098dac5975c82fd0b9a310d0a1548b9ab5206b2
parent5e90183ba429e73036bb2d5638a7a4d5cd56c6ca (diff)
downloadgodot-6fb2abc7d8329e64658dd281c4c0b6e90dd756e5.tar.gz
godot-6fb2abc7d8329e64658dd281c4c0b6e90dd756e5.tar.zst
godot-6fb2abc7d8329e64658dd281c4c0b6e90dd756e5.zip
SceneTreeDock: Fix crash when dragging invalid nodes.
Fixes #7529 (cherry picked from commit a64a348054ee0e3dccfb167afd93a62072726112)
-rw-r--r--tools/editor/scene_tree_dock.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp
index 4b3f17942..29527669f 100644
--- a/tools/editor/scene_tree_dock.cpp
+++ b/tools/editor/scene_tree_dock.cpp
@@ -1742,7 +1742,9 @@ void SceneTreeDock::_nodes_dragged(Array p_nodes,NodePath p_to,int p_type) {
for(int i=0;i<p_nodes.size();i++) {
Node *n=get_node((p_nodes[i]));
- nodes.push_back(n);
+ if (n) {
+ nodes.push_back(n);
+ }
}
if (nodes.size()==0)