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>2013-04-07 02:21:42 +0400
committerThomas Dinges <blender@dingto.org>2013-04-07 02:21:42 +0400
commit95080ea5cd6a039b668aac93787357be484aaf57 (patch)
tree530d5c9f341464c67151fd8cac40afbd8d0b29db /build_files
parent89863f78a90464e2ada35ecf0888cc7870828707 (diff)
Freestyle / Scons:
* Changes in tools\Blender.py were not merged, causing compile failure.
Diffstat (limited to 'build_files')
-rw-r--r--build_files/scons/tools/Blender.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index 543def4e836..37db10bbe5b 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -388,6 +388,10 @@ def creator(env):
defs.append('WITH_PYTHON')
if env['BF_DEBUG']:
defs.append('_DEBUG')
+
+ if env['WITH_BF_FREESTYLE']:
+ incs.append('#/source/blender/freestyle')
+ defs.append('WITH_FREESTYLE')
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
incs.append(env['BF_PTHREADS_INC'])