diff options
| -rw-r--r-- | SConstruct | 11 | ||||
| -rw-r--r-- | platform/windows/detect.py | 4 | ||||
| -rw-r--r-- | tools/editor/plugins/spatial_editor_plugin.cpp | 3 | ||||
| -rw-r--r-- | tools/editor/scenes_dock.cpp | 2 |
4 files changed, 17 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 4df8e0089d..ed65f2b89f 100644 --- a/SConstruct +++ b/SConstruct @@ -173,6 +173,17 @@ for p in platform_list: env['CCFLAGS'] = '' env.Append(CCFLAGS=string.split(str(CCFLAGS))) + + CFLAGS = env.get('CFLAGS', '') + env['CFLAGS'] = '' + + env.Append(CFLAGS=string.split(str(CFLAGS))) + + LINKFLAGS = env.get('LINKFLAGS', '') + env['LINKFLAGS'] = '' + + env.Append(LINKFLAGS=string.split(str(LINKFLAGS))) + detect.configure(env) env['platform'] = p if not env.has_key('platform_libsuffix'): diff --git a/platform/windows/detect.py b/platform/windows/detect.py index a94e43fc85..89c71418ea 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -129,8 +129,8 @@ def configure(env): else:
VC_PATH=""
- env.Append(CCFLAGS=["/I"+VC_PATH+"/Include"])
- env.Append(LIBPATH=[VC_PATH+"/Lib"])
+ env.Append(CCFLAGS=["/I" + p for p in os.getenv("INCLUDE").split(";")])
+ env.Append(LIBPATH=[p for p in os.getenv("LIB").split(";")])
env.Append(CCFLAGS=["/I"+DIRECTX_PATH+"/Include"])
env.Append(LIBPATH=[DIRECTX_PATH+"/Lib/x86"])
env['ENV'] = os.environ;
diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index be7214aaa7..0014c5a68a 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -1407,6 +1407,9 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { } break; + case KEY_F: { + _menu_option(VIEW_CENTER_TO_SELECTION); + } break; } diff --git a/tools/editor/scenes_dock.cpp b/tools/editor/scenes_dock.cpp index 02daa3c245..86331faa1d 100644 --- a/tools/editor/scenes_dock.cpp +++ b/tools/editor/scenes_dock.cpp @@ -181,7 +181,7 @@ void ScenesDock::_instance_pressed() { if (!sel) return; String path = sel->get_metadata(0); - emit_signal("instance","res://"+path); + emit_signal("instance",path); } void ScenesDock::_open_pressed(){ |