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
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2012-11-20 04:54:32 +0400
committerThomas Dinges <blender@dingto.org>2012-11-20 04:54:32 +0400
commitd19339a1819e4e5365641489eda1a923aa191bc5 (patch)
tree476be41a72d51bf4e7251f36f6ab247a4ef92caf /build_files
parent7cafd45f2b0e97fcaef1f631537958f460d71196 (diff)
Windows / OSL:
* Enable OSL for Windows and Windows Buildbot.
Diffstat (limited to 'build_files')
-rw-r--r--build_files/scons/config/win32-vc-config.py2
-rw-r--r--build_files/scons/config/win64-vc-config.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py
index 6983f63b3f9..2120938ec71 100644
--- a/build_files/scons/config/win32-vc-config.py
+++ b/build_files/scons/config/win32-vc-config.py
@@ -150,7 +150,7 @@ WITH_BF_OPENMP = True
#Cycles
WITH_BF_CYCLES = True
-WITH_BF_CYCLES_OSL = False
+WITH_BF_CYCLES_OSL = True
WITH_BF_STATICOSL = True
BF_OSL = '${LIBDIR}/osl'
BF_OSL_INC = '${BF_OSL}/include'
diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py
index 979c26a3a49..15bcdf999bd 100644
--- a/build_files/scons/config/win64-vc-config.py
+++ b/build_files/scons/config/win64-vc-config.py
@@ -146,7 +146,7 @@ WITH_BF_OPENMP = True
#Cycles
WITH_BF_CYCLES = True
-WITH_BF_CYCLES_OSL = False
+WITH_BF_CYCLES_OSL = True
WITH_BF_STATICOSL = True
BF_OSL = '${LIBDIR}/osl'
BF_OSL_INC = '${BF_OSL}/include'