[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52363] trunk/blender/intern/cycles/kernel /shaders/SConscript: Scons: better fix for OSL compiler path, so it also works on OS X.

Brecht Van Lommel brechtvanlommel at pandora.be
Mon Nov 19 16:50:31 CET 2012


Revision: 52363
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52363
Author:   blendix
Date:     2012-11-19 15:50:28 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
Scons: better fix for OSL compiler path, so it also works on OS X.

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

Modified: trunk/blender/intern/cycles/kernel/shaders/SConscript
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/SConscript	2012-11-19 15:42:08 UTC (rev 52362)
+++ trunk/blender/intern/cycles/kernel/shaders/SConscript	2012-11-19 15:50:28 UTC (rev 52363)
@@ -14,7 +14,7 @@
     shaders = env.Clone()
 
     # osl compiler
-    osl_compiler = env._canonicalize(env.subst(env['BF_OSL_COMPILER']))
+    osl_compiler = File(env.subst(env['BF_OSL_COMPILER'])).abspath
 
     # build directory
     root_build_dir = normpath(env['BF_BUILDDIR'])




More information about the Bf-blender-cvs mailing list