[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60643] trunk/blender/intern/cycles/kernel /shaders/SConscript: Fix OSL shader build failing with spaces in the path to build directory,

Brecht Van Lommel brechtvanlommel at pandora.be
Wed Oct 9 20:48:32 CEST 2013


Revision: 60643
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60643
Author:   blendix
Date:     2013-10-09 18:48:32 +0000 (Wed, 09 Oct 2013)
Log Message:
-----------
Fix OSL shader build failing with spaces in the path to build directory,
patch by Campbell.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/shaders/SConscript

Modified: trunk/blender/intern/cycles/kernel/shaders/SConscript
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/SConscript	2013-10-09 18:22:55 UTC (rev 60642)
+++ trunk/blender/intern/cycles/kernel/shaders/SConscript	2013-10-09 18:48:32 UTC (rev 60643)
@@ -57,7 +57,7 @@
             osl_file = os.path.join(source_dir, f)
             oso_file = os.path.join(build_dir, f.replace('.osl', '.oso'))
 
-            command = "%s -q -O2 -I%s -o %s %s" % (osl_compiler, source_dir, oso_file, osl_file)
+            command = [osl_compiler, "-q", "-O2", "-I", source_dir, oso_file, osl_file]
 
             shaders.Command(oso_file, f, command)
             shaders.Depends(oso_file, [f] + dependencies)




More information about the Bf-blender-cvs mailing list