summaryrefslogtreecommitdiff
path: root/editor/plugins
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-12-11 07:44:33 +0100
committerGitHub <noreply@github.com>2017-12-11 07:44:33 +0100
commit82b702d5da6c1f826e61d3e0e24a1da4a3aebcd2 (patch)
treea8a8e2ec634240628580bea5d662558ec5bcca81 /editor/plugins
parentc05c66ee01bcf285d5b4d952fb24c15af281803d (diff)
parentcd43188734975cae398a8e4d2137c6e1fa8c02d8 (diff)
Merge pull request #14533 from Krakean/addrootifnone_fix
Fix to #14503
Diffstat (limited to 'editor/plugins')
-rw-r--r--editor/plugins/canvas_item_editor_plugin.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index 150c184e90..ad22c12372 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -4730,6 +4730,7 @@ void CanvasItemEditorViewport::drop_data(const Point2 &p_point, const Variant &p
list.push_back(root_node);
} else {
drop_pos = p_point;
+ target_node = NULL;
_show_resource_type_selector();
return;
}