svn merge ^/trunk/blender -r40511:40587

2011-09-27 03:12:31 +00:00
parent 4d1e122d7b f4dec97cef
commit effea8c29b
191 changed files with 2172 additions and 1310 deletions
--- a/source/blender/editors/interface/SConscript
+++ b/source/blender/editors/interface/SConscript
@@ -14,7 +14,7 @@ incs += ' ../../python/' # python button eval
 defs = []

 if env['WITH_BF_INTERNATIONAL']:
-    defs.append('INTERNATIONAL')
+    defs.append('WITH_INTERNATIONAL')

 if env['WITH_BF_PYTHON']:
    defs.append('WITH_PYTHON')