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

Fix crash when using a Scalar Uniform node to GraphShader

Browse Source
This commit is contained in:
MarianoGNU 2015-10-17 15:27:36 -03:00
parent a5ebb52500
commit 25324aa506
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/resources/shader_graph.cpp
View File

@ -2196,7 +2196,6 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
case RGB_OP_DIFFERENCE: { case RGB_OP_DIFFERENCE: {
code += OUTNAME(p_node->id,0)+"=abs("+p_inputs[0]+"-"+p_inputs[1]+");\n"; code += OUTNAME(p_node->id,0)+"=abs("+p_inputs[0]+"-"+p_inputs[1]+");\n";
print_line(OUTNAME(p_node->id,0)+"=abs("+p_inputs[0]+"-"+p_inputs[1]+");\n");
} break; } break;
case RGB_OP_DARKEN: { case RGB_OP_DARKEN: {
@ -2545,9 +2544,6 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
}break; }break;
case NODE_SCALAR_INPUT: { case NODE_SCALAR_INPUT: {
DEF_SCALAR(0);
DEF_SCALAR(1);
DEF_SCALAR(2);
String name = p_node->param1; String name = p_node->param1;
float dv=p_node->param2; float dv=p_node->param2;
code +="uniform float "+name+"="+rtos(dv)+";\n"; code +="uniform float "+name+"="+rtos(dv)+";\n";
@ -2631,4 +2627,8 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
} }
} }
#undef DEF_SCALAR
#undef DEF_COLOR
#undef DEF_MATRIX
#undef DEF_VEC
} }