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:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-08-05 13:42:00 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-08-05 14:29:39 +0300
commita474409f0bf04fb2b87d7a914ea3f18d97623cdc (patch)
tree3c1a021a59015834fd40d596f5b82f1d5aec9728 /build_files/scons
parentc54df2ad47026a35c2629ba115ced64e7f33a42e (diff)
OpenSubdiv: Enable by default on the supported platforms
This commit makes sure Linux and Windows buildbots are using OpenSubdiv and also enables OpenSubdiv by default on Windows. OSX is kept disabled still, this is due to OpenGL restrictions which are not solved in any way yet. Linux is defaults to OpenSubdiv disabled because it needs precompiled library. The documentation could be found there: http://wiki.blender.org/index.php/User:Nazg-gul/OpenSubdiv
Diffstat (limited to 'build_files/scons')
-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 94e6cf9c8c4..9bd23a46d66 100644
--- a/build_files/scons/config/win32-vc-config.py
+++ b/build_files/scons/config/win32-vc-config.py
@@ -210,7 +210,7 @@ BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
#Freestyle
WITH_BF_FREESTYLE = True
-WITH_BF_OPENSUBDIV = False
+WITH_BF_OPENSUBDIV = True
BF_OPENSUBDIV = LIBDIR + '/opensubdiv'
BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include'
BF_OPENSUBDIV_LIB = 'osdCPU osdGPU'
diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py
index c25b62a756a..adacc2946c5 100644
--- a/build_files/scons/config/win64-vc-config.py
+++ b/build_files/scons/config/win64-vc-config.py
@@ -214,7 +214,7 @@ BF_RAYOPTIMIZATION_SSE_FLAGS = ['']
#Freestyle
WITH_BF_FREESTYLE = True
-WITH_BF_OPENSUBDIV = False
+WITH_BF_OPENSUBDIV = True
BF_OPENSUBDIV = LIBDIR + '/opensubdiv'
BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include'
BF_OPENSUBDIV_LIB = 'osdCPU osdGPU'