diff options
| author | Anton Yabchinskiy | 2015-01-14 23:17:15 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy | 2015-01-14 23:17:15 +0300 |
| commit | d6998995b54fd4fed83eef9db3bbb45fa60565db (patch) | |
| tree | 927e4e2441db1c62b3853d03f3ed4bb996881045 /scene/resources/shader_graph.cpp | |
| parent | b6c5cb1064eab63788060dc918d7fec53e57a532 (diff) | |
| parent | 04af74596d070f062bd917b0364d87c57544f8d5 (diff) | |
| download | godot-d6998995b54fd4fed83eef9db3bbb45fa60565db.tar.gz godot-d6998995b54fd4fed83eef9db3bbb45fa60565db.tar.zst godot-d6998995b54fd4fed83eef9db3bbb45fa60565db.zip | |
Merge branch 'master' of github.com:okamstudio/godot
Conflicts:
platform/x11/detect.py
Diffstat (limited to 'scene/resources/shader_graph.cpp')
| -rw-r--r-- | scene/resources/shader_graph.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/scene/resources/shader_graph.cpp b/scene/resources/shader_graph.cpp index 8b2f318ec..9703799a4 100644 --- a/scene/resources/shader_graph.cpp +++ b/scene/resources/shader_graph.cpp @@ -28,9 +28,6 @@ /*************************************************************************/ #include "shader_graph.h" #include "scene/scene_string_names.h" -//todo -//-RGB ops -//-mostrar error de conexion Array ShaderGraph::_get_node_list(ShaderType p_type) const { |