From 73ff3ac2180f73610392831d437dd0a1862b8dd8 Mon Sep 17 00:00:00 2001 From: mostafahassan Date: Tue, 31 Mar 2015 21:34:50 +0200 Subject: [PATCH 1/2] (Fix) script will not be able to extend itself --- modules/gdscript/gd_script.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp index 06c746c4fb9..f13b51c0087 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -1689,7 +1689,7 @@ bool GDScript::_update_exports() { } - if (c->extends_used && String(c->extends_file)!="") { + if (c->extends_used && String(c->extends_file)!="" && String(c->extends_file) != get_path()) { String path = c->extends_file; if (path.is_rel_path()) { From 78d734873d27d855e01d574a6dd3a6380b2fa5ec Mon Sep 17 00:00:00 2001 From: mostafahassan Date: Tue, 31 Mar 2015 22:49:11 +0200 Subject: [PATCH 2/2] Fixed crash when trying to add keypoints and deleting them while holding mouse button down. --- tools/editor/plugins/shader_graph_editor_plugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/editor/plugins/shader_graph_editor_plugin.cpp b/tools/editor/plugins/shader_graph_editor_plugin.cpp index 508e8b4cbad..e829c06e6f8 100644 --- a/tools/editor/plugins/shader_graph_editor_plugin.cpp +++ b/tools/editor/plugins/shader_graph_editor_plugin.cpp @@ -376,7 +376,7 @@ void GraphCurveMapEdit::_input_event(const InputEvent& p_event) { update(); } - if (p_event.type==InputEvent::MOUSE_MOTION && grabbing) { + if (p_event.type==InputEvent::MOUSE_MOTION && grabbing && grabbed != -1) { Point2 p = Vector2(p_event.mouse_button.x,p_event.mouse_button.y)/get_size(); p.y=1.0-p.y;