asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better way to disable asset library

Browse source
This commit is contained in:
Juan Linietsky 2016-06-09 22:47:43 -03:00
parent c5a2aff6db
commit 00bfdc834b
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tools/editor/editor_node.cpp
View file

@ -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);

16
tools/editor/project_manager.cpp
View file

@ -39,7 +39,7 @@
#include "scene/gui/line_edit.h"
#include "scene/gui/panel_container.h"
#include "scene/gui/center_container.h"
#include "io/stream_peer_ssl.h"
#include "scene/gui/texture_frame.h"
#include "scene/gui/margin_container.h"
@ -986,15 +986,15 @@ ProjectManager::ProjectManager() {
tree_vb->add_spacer();
#ifdef OPENSSL_ENABLED
if (StreamPeerSSL::is_available()) {
asset_library = memnew( EditorAssetLibrary(true) );
asset_library->set_name("Templates");
tabs->add_child(asset_library);
asset_library = memnew( EditorAssetLibrary(true) );
asset_library->set_name("Templates");
tabs->add_child(asset_library);
} else {
WARN_PRINT("Asset Library not available, as it requires SSL to work.");
}
#else
#warning Asset Library will not compile without SSL
#endif
CenterContainer *cc = memnew( CenterContainer );
Button * cancel = memnew( Button );