Windows / OSL:
authorThomas Dinges <blender@dingto.org>
Tue, 20 Nov 2012 00:54:32 +0000 (00:54 +0000)
committerThomas Dinges <blender@dingto.org>
Tue, 20 Nov 2012 00:54:32 +0000 (00:54 +0000)
* Enable OSL for Windows and Windows Buildbot.

build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-vc-config.py

index 6983f63b3f905ac89704ccaba479032095d2b2c0..2120938ec714c99e7473712daeb967e9c765d266 100644 (file)
@@ -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'
index 979c26a3a49d091cea0fcfbe8d08d45806b6429a..15bcdf999bd8e2e38ab3851fd6a6891d52049845 100644 (file)
@@ -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'