godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32543 from Chaosus/vs_fix_input

Browse Source 
Fix VisualShaderInput (if compiled with MinGW) (correct, tested version)
This commit is contained in:
Yuri Roubinsky 2019-10-04 13:57:01 +03:00 committed by GitHub
commit b6f8726c66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/plugins/visual_shader_editor_plugin.cpp
View File

@ -2053,7 +2053,7 @@ Variant VisualShaderEditor::get_drag_data_fw(const Point2 &p_point, Control *p_f
Dictionary d; Dictionary d;
d["id"] = id; d["id"] = id;
if (op.sub_func_str != "") { if (op.sub_func == -1) {
d["sub_func"] = op.sub_func_str; d["sub_func"] = op.sub_func_str;
} else { } else {
d["sub_func"] = op.sub_func; d["sub_func"] = op.sub_func;

1
editor/plugins/visual_shader_editor_plugin.h
View File

@ -137,6 +137,7 @@ class VisualShaderEditor : public VBoxContainer {
category = p_category; category = p_category;
sub_category = p_sub_category; sub_category = p_sub_category;
description = p_description; description = p_description;
sub_func = 0;
sub_func_str = p_sub_func; sub_func_str = p_sub_func;
return_type = p_return_type; return_type = p_return_type;
mode = p_mode; mode = p_mode;