Merged changes in the trunk up to revision 52118.

Conflicts resolved: source/blender/makesrna/intern/rna_scene.c
2012-11-12 00:30:55 +00:00
parent a8a2782d34 fbc1cc712f
commit 7fa096261a
285 changed files with 6523 additions and 2589 deletions
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@ -504,7 +504,7 @@ void PyC_SetHomePath(const char *py_path_bundle)
 	 * but current Python lib (release 3.1.1) doesn't handle these correctly */
 	if (strchr(py_path_bundle, ':'))
 		printf("Warning : Blender application is located in a path containing : or / chars\
-			   \nThis may make python import function fail\n");
+		       \nThis may make python import function fail\n");
 #endif