diff options
| author | Carl Olsson | 2015-02-02 21:34:47 +1000 |
|---|---|---|
| committer | Carl Olsson | 2015-02-02 21:34:47 +1000 |
| commit | ee44664b2a14c0878f2e137dc4b6a1fbf4013eab (patch) | |
| tree | 1a1e4712f96c84a2457200a6047030b72d7981d1 /tools/editor/plugins/shader_editor_plugin.cpp | |
| parent | c5bf43f6eb8aa9815362b1f771396e68c7f26f0f (diff) | |
| parent | 67d357191ff74b2cfc80015941363a97e7ee19fd (diff) | |
| download | godot-ee44664b2a14c0878f2e137dc4b6a1fbf4013eab.tar.gz godot-ee44664b2a14c0878f2e137dc4b6a1fbf4013eab.tar.zst godot-ee44664b2a14c0878f2e137dc4b6a1fbf4013eab.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'tools/editor/plugins/shader_editor_plugin.cpp')
| -rw-r--r-- | tools/editor/plugins/shader_editor_plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/plugins/shader_editor_plugin.cpp b/tools/editor/plugins/shader_editor_plugin.cpp index 81b5cd8f7..2fcd4e8cd 100644 --- a/tools/editor/plugins/shader_editor_plugin.cpp +++ b/tools/editor/plugins/shader_editor_plugin.cpp @@ -396,7 +396,7 @@ void ShaderEditor::edit(const Ref<Shader>& p_shader) { light_editor->set_edited_shader(shader,ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT); } - vertex_editor->set_edited_shader(shader,ShaderLanguage::SHADER_MATERIAL_VERTEX); + //vertex_editor->set_edited_shader(shader,ShaderLanguage::SHADER_MATERIAL_VERTEX); // see if already has it |