godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

Merge pull request #7347 from bebae/master

Browse Source 
Allows to start the scene with custom arguments within the editor
This commit is contained in:
Rémi Verschelde
2016-12-23 15:59:16 +01:00
committed by GitHub
parent 36f03f9461 abdedc3522
commit d1e3c0f017
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/editor/editor_node.cpp
View File

@@ -1848,7 +1848,6 @@ void EditorNode::_run(bool p_current,const String& p_custom) {
run_filename=scene->get_filename();
} else {
args=run_settings_dialog->get_custom_arguments();
current_filename=scene->get_filename();
}
@@ -1926,6 +1925,8 @@ void EditorNode::_run(bool p_current,const String& p_custom) {
List<String> breakpoints;
editor_data.get_editor_breakpoints(&breakpoints);
args = Globals::get_singleton()->get("editor/main_run_args");
Error error = editor_run.run(run_filename,args,breakpoints,current_filename);
@@ -5458,7 +5459,7 @@ EditorNode::EditorNode() {
editor_import_export->load_config();
GLOBAL_DEF("editor/main_run_args","$exec -path $path -scene $scene $main_scene");
GLOBAL_DEF("editor/main_run_args","$scene");
ObjectTypeDB::set_type_enabled("CollisionShape",true);
ObjectTypeDB::set_type_enabled("CollisionShape2D",true);