asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1591 from MostafaHassan/pr_FixCrashInVisualShader

Browse source 
(Fix crash) in visual shader for curve remap node
This commit is contained in:
Juan Linietsky 2015-04-07 20:14:10 -03:00
commit b1bf4fcef2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/gdscript/gd_script.cpp
View file

@ -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()) {

2
tools/editor/plugins/shader_graph_editor_plugin.cpp
View file

@ -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;