diff options
| author | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-12 11:30:19 +0800 |
|---|---|---|
| committer | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-12 11:30:19 +0800 |
| commit | 6b6c5260488d21c399d389d11e676cce0eba3379 (patch) | |
| tree | e0b322c1c293b448e200b40872e9cfdeff1c9230 /tools/editor/editor_node.cpp | |
| parent | c464cd44609e24974cba1cd25315b1e1e1fc8942 (diff) | |
| parent | f3dc51fc69ec3a16c6b2a6834ff0a6d933b1ddca (diff) | |
Merge branch 'master' into x11-window-management
Diffstat (limited to 'tools/editor/editor_node.cpp')
| -rw-r--r-- | tools/editor/editor_node.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 52c75c6d7e..f859d19504 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -4036,7 +4036,8 @@ EditorNode::EditorNode() { add_editor_plugin( memnew( EditorHelpPlugin(this) ) ); add_editor_plugin( memnew( AnimationPlayerEditorPlugin(this) ) ); add_editor_plugin( memnew( ShaderGraphEditorPlugin(this) ) ); - add_editor_plugin( memnew( ShaderEditorPlugin(this) ) ); + add_editor_plugin( memnew( ShaderEditorPlugin(this,true) ) ); + add_editor_plugin( memnew( ShaderEditorPlugin(this,false) ) ); add_editor_plugin( memnew( CameraEditorPlugin(this) ) ); add_editor_plugin( memnew( SampleEditorPlugin(this) ) ); add_editor_plugin( memnew( SampleLibraryEditorPlugin(this) ) ); |