Merge branch 'master' of https://github.com/okamstudio/godot

godotengine · Feb 26, 2014 · a65edb4 · a65edb4
2 parents 768fc7e + a9aae30
commit a65edb4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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(){