Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-19 19:50:28 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-19 19:50:28 +0400
commitabce6309e39a537f38d4f8a8c2ae12749e94b8c9 (patch)
tree5c94cdfc6eaf30fd5fe247330a50ffc3ae01dd00 /intern
parent2f5010213124b02edafc8a7ff9349478f9003d6f (diff)
Scons: better fix for OSL compiler path, so it also works on OS X.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/kernel/shaders/SConscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/shaders/SConscript b/intern/cycles/kernel/shaders/SConscript
index f1c30395b70..36b86d7b4f6 100644
--- a/intern/cycles/kernel/shaders/SConscript
+++ b/intern/cycles/kernel/shaders/SConscript
@@ -14,7 +14,7 @@ if env['WITH_BF_CYCLES_OSL']:
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'])