diff options
author | Juan Linietsky <reduzio@gmail.com> | 2014-10-07 01:31:49 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2014-10-07 01:31:49 -0300 |
commit | 0fa94a96904a8ff44d1a26fd6b783c2d6a533540 (patch) | |
tree | 80cc315b3578a1e1ffc7d73f18768db269dbafb3 /main/main.cpp | |
parent | a0ae38e0c14f94911df6a651c90ff0df03821bbc (diff) |
Build System Changes
-=-=-=-=-=-=-=-=-=-=
Build System:
-Big clean up of SCons, changed how builds are done to a much cleaner method (check the Github Wiki for instructions).
-Deactivated BlackBerry10 (sorry), if no mantainer found (or BlackBerry does not send us a Passort ;), platform will be removed as we have no longer devices to test.
Engine:
-Removed deprecated object and scene format (was in there just for compatibility, not in use since a long time).
-Added ability to open scenes even if a node type was removed (will try to guess the closest type).
-Removed deprecated node types.
Diffstat (limited to 'main/main.cpp')
-rw-r--r-- | main/main.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/main/main.cpp b/main/main.cpp index 2d286759d9..fa7ce50c6d 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -43,7 +43,7 @@ #include "io/resource_loader.h" #include "scene/main/scene_main_loop.h" -#include "scene/io/scene_loader.h" + #include "script_language.h" #include "io/resource_loader.h" @@ -1131,10 +1131,6 @@ bool Main::start() { #ifdef TOOLS_ENABLED if (editor) { -#ifdef OLD_SCENE_FORMAT_ENABLED - if (convert_old) - editor_node->set_convert_old_scene(true); -#endif if (_import!="") { @@ -1214,14 +1210,6 @@ bool Main::start() { if (scenedata.is_valid()) scene=scenedata->instance(); -#ifdef OLD_SCENE_FORMAT_ENABLED - - if (!scene) { - scene = SceneLoader::load(local_game_path,true); - } - -#endif - ERR_EXPLAIN("Failed loading scene: "+local_game_path); ERR_FAIL_COND_V(!scene,false) sml->get_root()->add_child(scene); |