diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-06-09 22:47:43 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-06-09 22:47:43 -0300 |
commit | 00bfdc834bc028e7c15e939662a72353250d00f3 (patch) | |
tree | 1b5ad7f4acdbe5d203832cd124b8cd33be5e8889 /tools/editor/editor_node.cpp | |
parent | c5a2aff6db2ee419c544a4eb38f2629f4f9555ee (diff) |
Better way to disable asset library
Diffstat (limited to 'tools/editor/editor_node.cpp')
-rw-r--r-- | tools/editor/editor_node.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 269ecb1032..26e40cf816 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -56,7 +56,7 @@ #include "io/zip_io.h" #include "io/config_file.h" #include "animation_editor.h" - +#include "io/stream_peer_ssl.h" // plugins #include "plugins/sprite_frames_editor_plugin.h" #include "plugins/texture_region_editor_plugin.h" @@ -6381,12 +6381,12 @@ EditorNode::EditorNode() { add_editor_plugin( memnew( CanvasItemEditorPlugin(this) ) ); add_editor_plugin( memnew( SpatialEditorPlugin(this) ) ); add_editor_plugin( memnew( ScriptEditorPlugin(this) ) ); -#ifdef OPENSSL_ENABLED - add_editor_plugin( memnew( AssetLibraryEditorPlugin(this) ) ); -#else -#warning Asset Library will not compile without SSL -#endif + if (StreamPeerSSL::is_available()) { + add_editor_plugin( memnew( AssetLibraryEditorPlugin(this) ) ); + } else { + WARN_PRINT("Asset Library not available, as it requires SSL to work."); + } //more visually meaningful to have this later raise_bottom_panel_item(AnimationPlayerEditor::singleton); |