noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Allows to start the scene with custom arguments within the editor

Browse Source 
fixes #7346

Path from the current scene isn't added too the argumens anymore by default and needs to be added throug the custom arguments, with $scene. Matches the behaviour of the executable without any arguments.
Custom Arguments are read from editor/main_run_args
This commit is contained in:
bebae
2016-12-21 15:32:52 +01:00
parent 2c8a172915
commit abdedc3522
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);