Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-26 11:14:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

-Renamed GlobalConfig to ProjectSettings, makes more sense.

Browse source 
-Added system for feature overrides, it's pretty cool :)
This commit is contained in:
Juan Linietsky 2017-07-19 17:00:46 -03:00
parent 89588d4334
commit 25678b1876
162 changed files with 1296 additions and 831 deletions
Download patch file Download diff file Expand all files Collapse all files

6
editor/plugins/script_editor_plugin.cpp
View file

@ -32,7 +32,7 @@
#include "editor/editor_node.h"
#include "editor/editor_settings.h"
#include "editor/script_editor_debugger.h"
#include "global_config.h"
#include "project_settings.h"
#include "io/resource_loader.h"
#include "io/resource_saver.h"
#include "os/file_access.h"
@ -1603,8 +1603,8 @@ bool ScriptEditor::edit(const Ref<Script> &p_script, int p_line, int p_col, bool
String flags = EditorSettings::get_singleton()->get("text_editor/external/exec_flags");
Dictionary keys;
keys["project"] = GlobalConfig::get_singleton()->get_resource_path();
keys["file"] = GlobalConfig::get_singleton()->globalize_path(p_script->get_path());
keys["project"] = ProjectSettings::get_singleton()->get_resource_path();
keys["file"] = ProjectSettings::get_singleton()->globalize_path(p_script->get_path());
keys["line"] = p_line >= 0 ? p_line : 0;
keys["col"] = p_col;