|
@@ -656,12 +656,12 @@ void EditorInterface::edit_script(const Ref<Script> &p_script, int p_line, int p
|
|
|
ScriptEditor::get_singleton()->edit(p_script, p_line - 1, p_col - 1, p_grab_focus);
|
|
|
}
|
|
|
|
|
|
-void EditorInterface::open_scene_from_path(const String &scene_path) {
|
|
|
+void EditorInterface::open_scene_from_path(const String &scene_path, bool p_set_inherited) {
|
|
|
if (EditorNode::get_singleton()->is_changing_scene()) {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- EditorNode::get_singleton()->open_request(scene_path);
|
|
|
+ EditorNode::get_singleton()->open_request(scene_path, p_set_inherited);
|
|
|
}
|
|
|
|
|
|
void EditorInterface::reload_scene_from_path(const String &scene_path) {
|
|
@@ -839,7 +839,7 @@ void EditorInterface::_bind_methods() {
|
|
|
ClassDB::bind_method(D_METHOD("edit_resource", "resource"), &EditorInterface::edit_resource);
|
|
|
ClassDB::bind_method(D_METHOD("edit_node", "node"), &EditorInterface::edit_node);
|
|
|
ClassDB::bind_method(D_METHOD("edit_script", "script", "line", "column", "grab_focus"), &EditorInterface::edit_script, DEFVAL(-1), DEFVAL(0), DEFVAL(true));
|
|
|
- ClassDB::bind_method(D_METHOD("open_scene_from_path", "scene_filepath"), &EditorInterface::open_scene_from_path);
|
|
|
+ ClassDB::bind_method(D_METHOD("open_scene_from_path", "scene_filepath", "set_inherited"), &EditorInterface::open_scene_from_path, DEFVAL(false));
|
|
|
ClassDB::bind_method(D_METHOD("reload_scene_from_path", "scene_filepath"), &EditorInterface::reload_scene_from_path);
|
|
|
|
|
|
ClassDB::bind_method(D_METHOD("get_open_scenes"), &EditorInterface::get_open_scenes);
|