[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42452] trunk/blender: attempt to fix defione for qtcreator project file and cycles define.

[Campbell Barton]

Revision: 42452
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42452
Author:   campbellbarton
Date:     2011-12-06 04:53:16 +0000 (Tue, 06 Dec 2011)
Log Message:
-----------
attempt to fix defione for qtcreator project file and cycles define.

Modified Paths:
--------------
    trunk/blender/build_files/cmake/cmake_qtcreator_project.py
    trunk/blender/release/scripts/modules/bpy_extras/io_utils.py

Modified: trunk/blender/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_qtcreator_project.py	2011-12-06 03:31:28 UTC (rev 42451)
+++ trunk/blender/build_files/cmake/cmake_qtcreator_project.py	2011-12-06 04:53:16 UTC (rev 42452)
@@ -47,6 +47,13 @@
 import sys
 
 
+def quote_define(define):
+    if " " in define.strip():
+        return '"%s"' % define
+    else:
+        return define
+
+
 def create_qtc_project_main():
     files = list(source_list(SOURCE_DIR, filename_check=is_project_file))
     files_rel = [os.path.relpath(f, start=PROJECT_DIR) for f in files]
@@ -99,7 +106,7 @@
         qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % FILE_NAME)
         f = open(qtc_cfg, 'w')
         f.write("// ADD PREDEFINED MACROS HERE!\n")
-        defines_final = [("#define %s %s" % item) for item in defines]
+        defines_final = [("#define %s %s" % (item[0], quote_define(item[0]))) for item in defines]
         if sys.platform != "win32":
             defines_final += cmake_compiler_defines()
         f.write("\n".join(defines_final))

Modified: trunk/blender/release/scripts/modules/bpy_extras/io_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/io_utils.py	2011-12-06 03:31:28 UTC (rev 42451)
+++ trunk/blender/release/scripts/modules/bpy_extras/io_utils.py	2011-12-06 04:53:16 UTC (rev 42452)
@@ -269,8 +269,6 @@
 
         return axis_forward, axis_up
 
-    change = False
-
     axis = getattr(operator, forward_attr), getattr(operator, up_attr)
     axis_new = validate(*axis)