summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2016-10-31 07:45:06 +0100
committerGitHub <noreply@github.com>2016-10-31 07:45:06 +0100
commitde454318e72f5de13c5a1efff5811d41e360a8a2 (patch)
tree3440c85d862b07fd13d96148ed9c2cfcbb4e1057
parent1fde6f25cd34a5264d7a4114b546389fafc21b27 (diff)
parenta7d492eb53489083181682839c6d7f83a888ad46 (diff)
downloadredot-engine-de454318e72f5de13c5a1efff5811d41e360a8a2.tar.gz
Merge pull request #6991 from volzhs/fix-memleak
Fix memory leak with drag & drop on 2D viewport
-rw-r--r--tools/editor/plugins/canvas_item_editor_plugin.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp
index ac39e0687c..af9fd69ae7 100644
--- a/tools/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp
@@ -3797,6 +3797,7 @@ bool CanvasItemEditorViewport::_create_instance(Node* parent, String& path, cons
if (editor->get_edited_scene()->get_filename()!="") { // cyclical instancing
if (_cyclical_dependency_exists(editor->get_edited_scene()->get_filename(), instanced_scene)) {
+ memdelete(instanced_scene);
return false;
}
}