diff options
| author | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-22 00:12:53 +0900 |
|---|---|---|
| committer | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-22 00:12:53 +0900 |
| commit | 6dd1a21fb7fbac03fb8343f5858c22185ca6c59e (patch) | |
| tree | d749f407a47fdc2b2e4fcfded79a039f0f437e91 /tools/editor/plugins/shader_editor_plugin.cpp | |
| parent | c5080e23b822766b99cebb18618ff3fa69f16beb (diff) | |
| parent | c6eabbbec5a9fec7a0d473fe67a544af3454c3d2 (diff) | |
| download | redot-engine-6dd1a21fb7fbac03fb8343f5858c22185ca6c59e.tar.gz | |
Merge remote-tracking branch 'upstream/master' into x11-window-management
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 81b5cd8f78..2fcd4e8cd1 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 |