-Much improvement to baked light baker

-Fixed many bugs in stretch mode
-Fixes to camera project and unproject as consequence of the above
-added setget to script (documented in script doc)
-more fixes to collada exporter for blender

5 files changed, 33 insertions, 32 deletions

diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index aef223470a..6bf94b8289 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -184,6 +184,7 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 	String cmdline;
 	bool _signed;
 	bool apk_expansion;
+	bool remove_prev;
 	String apk_expansion_salt;
 	String apk_expansion_pkey;
 	int orientation;
@@ -258,7 +259,9 @@ bool EditorExportPlatformAndroid::_set(const StringName& p_name, const Variant&
 
 	String n=p_name;
 
-	if (n=="custom_package/debug")
+	if (n=="one_click_deploy/clear_previous_install")
+		remove_prev=p_value;
+	else if (n=="custom_package/debug")
 		custom_debug_package=p_value;
 	else if (n=="custom_package/release")
 		custom_release_package=p_value;
@@ -321,7 +324,9 @@ bool EditorExportPlatformAndroid::_set(const StringName& p_name, const Variant&
 bool EditorExportPlatformAndroid::_get(const StringName& p_name,Variant &r_ret) const{
 
 	String n=p_name;
-	if (n=="custom_package/debug")
+	if (n=="one_click_deploy/clear_previous_install")
+		r_ret=remove_prev;
+	else if (n=="custom_package/debug")
 		r_ret=custom_debug_package;
 	else if (n=="custom_package/release")
 		r_ret=custom_release_package;
@@ -378,6 +383,7 @@ bool EditorExportPlatformAndroid::_get(const StringName& p_name,Variant &r_ret)
 
 void EditorExportPlatformAndroid::_get_property_list( List<PropertyInfo> *p_list) const{
 
+	p_list->push_back( PropertyInfo( Variant::BOOL, "one_click_deploy/clear_previous_install"));
 	p_list->push_back( PropertyInfo( Variant::STRING, "custom_package/debug", PROPERTY_HINT_GLOBAL_FILE,"apk"));
 	p_list->push_back( PropertyInfo( Variant::STRING, "custom_package/release", PROPERTY_HINT_GLOBAL_FILE,"apk"));
 	p_list->push_back( PropertyInfo( Variant::STRING, "command_line/extra_args"));
@@ -1448,16 +1454,20 @@ Error EditorExportPlatformAndroid::run(int p_device, bool p_dumb) {
 		return err;
 	}
 
-	ep.step("Uninstalling..",1);
-
-	print_line("Uninstalling previous version: "+devices[p_device].name);
 	List<String> args;
-	args.push_back("-s");
-	args.push_back(devices[p_device].id);
-	args.push_back("uninstall");
-	args.push_back(package);
 	int rv;
-	err = OS::get_singleton()->execute(adb,args,true,NULL,NULL,&rv);
+
+	if (remove_prev) {
+		ep.step("Uninstalling..",1);
+
+		print_line("Uninstalling previous version: "+devices[p_device].name);
+
+		args.push_back("-s");
+		args.push_back(devices[p_device].id);
+		args.push_back("uninstall");
+		args.push_back(package);
+
+		err = OS::get_singleton()->execute(adb,args,true,NULL,NULL,&rv);
 #if 0
 	if (err || rv!=0) {
 		EditorNode::add_io_error("Could not install to device.");
@@ -1465,6 +1475,8 @@ Error EditorExportPlatformAndroid::run(int p_device, bool p_dumb) {
 		return ERR_CANT_CREATE;
 	}
 #endif
+	}
+
 	print_line("Installing into device (please wait..): "+devices[p_device].name);
 	ep.step("Installing to Device (please wait..)..",2);
 
@@ -1473,7 +1485,7 @@ Error EditorExportPlatformAndroid::run(int p_device, bool p_dumb) {
 	args.push_back(devices[p_device].id);
 	args.push_back("install");
 	args.push_back(export_to);
-	rv;
+
 	err = OS::get_singleton()->execute(adb,args,true,NULL,NULL,&rv);
 	if (err || rv!=0) {
 		EditorNode::add_io_error("Could not install to device.");
@@ -1515,6 +1527,7 @@ EditorExportPlatformAndroid::EditorExportPlatformAndroid() {
 	device_lock = Mutex::create();
 	quit_request=false;
 	orientation=0;
+	remove_prev=false;
 
 	device_thread=Thread::create(_device_poll_thread,this);
 	devices_changed=true;
diff --git a/platform/isim/SCsub b/platform/isim/SCsub
index e7de935b2e..07761486a9 100644
--- a/platform/isim/SCsub
+++ b/platform/isim/SCsub
@@ -34,11 +34,4 @@ if env['ios_appirater'] == "yes":
 obj = env_ios.Object('#platform/iphone/godot_iphone.cpp')
 
 prog = None
-if env["target"]=="release":
-	prog = env_ios.Program('#bin/godot_opt', [obj] + iphone_lib)
-	#action = "dsymutil "+File(prog)[0].path+" -o ../build/script_exec/build/Debug-iphoneos/script_exec.app.dSYM"
-	#env.AddPostAction(prog, action)
-else:
-	prog = env_ios.Program('#bin/godot', [obj] + iphone_lib)
-	#action = "dsymutil "+File(prog)[0].path+" -o ../build/script_exec/build/Debug-iphoneos/script_exec.app.dSYM"
-	#env.AddPostAction(prog, action)
+prog = env_ios.Program('#bin/godot', [obj] + iphone_lib)
diff --git a/platform/isim/detect.py b/platform/isim/detect.py
index c89ca81167..f4a17838f9 100644
--- a/platform/isim/detect.py
+++ b/platform/isim/detect.py
@@ -22,7 +22,7 @@ def get_opts():
 	return [
 		('ISIMPLATFORM', 'name of the iphone platform', 'iPhoneSimulator'),
 		('ISIMPATH', 'the path to iphone toolchain', '/Applications/Xcode.app/Contents/Developer/Platforms/${ISIMPLATFORM}.platform'),
-		('ISIMSDK', 'path to the iphone SDK', '$ISIMPATH/Developer/SDKs/${ISIMPLATFORM}7.0.sdk'),
+		('ISIMSDK', 'path to the iphone SDK', '$ISIMPATH/Developer/SDKs/${ISIMPLATFORM}7.1.sdk'),
 		('game_center', 'Support for game center', 'yes'),
 		('store_kit', 'Support for in-app store', 'yes'),
 		('ios_gles22_override', 'Force GLES2.0 on iOS', 'yes'),
@@ -34,9 +34,7 @@ def get_opts():
 def get_flags():
 
 	return [
-		('lua', 'no'),
 		('tools', 'yes'),
-		('nedmalloc', 'no'),
 		('webp', 'yes'),
 	]
 
@@ -46,10 +44,6 @@ def configure(env):
 
 	env.Append(CPPPATH=['#platform/iphone'])
 
-	env['OBJSUFFIX'] = ".isim.o"
-	env['LIBSUFFIX'] = ".isim.a"
-	env['PROGSUFFIX'] = ".isim"
-
 	env['ENV']['PATH'] = env['ISIMPATH']+"/Developer/usr/bin/:"+env['ENV']['PATH']
 
 	env['CC'] = '$ISIMPATH/Developer/usr/bin/gcc'
@@ -83,8 +77,6 @@ def configure(env):
 
 		env.Append(CCFLAGS=['-O3', '-ffast-math'])
 		env.Append(LINKFLAGS=['-O3', '-ffast-math'])
-		env['OBJSUFFIX'] = "_opt"+env['OBJSUFFIX']
-		env['LIBSUFFIX'] = "_opt"+env['LIBSUFFIX']
 
 	elif (env["target"]=="debug"):
 
@@ -99,8 +91,6 @@ def configure(env):
 
 	env['ENV']['MACOSX_DEPLOYMENT_TARGET'] = '10.6'
 	env['ENV']['CODESIGN_ALLOCATE'] = '/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate'
-	env.Append(CPPFLAGS=['-DIPHONE_ENABLED', '-DUNIX_ENABLED', '-DGLES2_ENABLED', '-fno-exceptions'])
+	env.Append(CPPFLAGS=['-DIPHONE_ENABLED', '-DUNIX_ENABLED', '-DGLES2_ENABLED', '-fexceptions'])
 
-	if env['lua'] == "yes":
-		env.Append(CCFLAGS=['-DLUA_USE_FLOAT'])
 
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index 63fb5a47a5..16f70b60d0 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -64,7 +64,7 @@ def get_flags():
 	return [

 		('freetype','builtin'), #use builtin freetype

 		('openssl','builtin'), #use builtin openssl

-		('theora','no'), #use builtin openssl

+		('theora','no'),

 	]

 			

 

diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 8616a20486..03de91fa2f 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -54,6 +54,7 @@ def get_flags():
 	return [
 	('builtin_zlib', 'no'),
 	("openssl", "yes"),
+	("theora","no"),
         ]
 			
 
@@ -77,6 +78,10 @@ def configure(env):
 		if (env["use_sanitizer"]=="yes"):
 			env.Append(CXXFLAGS=['-fsanitize=address','-fno-omit-frame-pointer'])
 			env.Append(LINKFLAGS=['-fsanitize=address'])
+			env.extra_suffix=".llvms"
+		else:
+			env.extra_suffix=".llvm"
+