diff options
| author | santiagopf <punto@Ariels-Mac-mini.local> | 2015-12-14 10:58:26 -0300 |
|---|---|---|
| committer | santiagopf <punto@Ariels-Mac-mini.local> | 2015-12-14 10:58:26 -0300 |
| commit | a9795d582665598decd4e73e1d879c83ce28a44b (patch) | |
| tree | 777a3da33fed3d6906704680e01bd87f97eba113 /scene/resources/shader_graph.cpp | |
| parent | c8077de71475c174aa14fd045a2cddfc28de2468 (diff) | |
| parent | bfaa179e7088d9d6f4cf289e1915eec12c6b3b2a (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'scene/resources/shader_graph.cpp')
| -rw-r--r-- | scene/resources/shader_graph.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/shader_graph.cpp b/scene/resources/shader_graph.cpp index 7b67eaeda8..f8a14e58a0 100644 --- a/scene/resources/shader_graph.cpp +++ b/scene/resources/shader_graph.cpp @@ -260,7 +260,7 @@ void ShaderGraph::_bind_methods() { ObjectTypeDB::bind_method(_MD("clear","shader_type"),&ShaderGraph::clear); ObjectTypeDB::bind_method(_MD("node_set_state","shader_type","id","state"),&ShaderGraph::node_set_state); - ObjectTypeDB::bind_method(_MD("node_get_state:var","shader_type","id"),&ShaderGraph::node_get_state); + ObjectTypeDB::bind_method(_MD("node_get_state:Variant","shader_type","id"),&ShaderGraph::node_get_state); ObjectTypeDB::bind_method(_MD("_set_data"),&ShaderGraph::_set_data); ObjectTypeDB::bind_method(_MD("_get_data"),&ShaderGraph::_get_data); |