From a462d69bbf771e49d2fa49589608c375376b42ed Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Thu, 20 Dec 2012 07:57:26 +0000 Subject: Another big patch set by Bastien Montagne, thanks a lot! * Made Freestyle optional (turned on by default). * Fix for missing bpath.c updates in the previous merge of trunk changes. --- source/blender/python/SConscript | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source/blender/python/SConscript') diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index 21af50dbf10..ddb8594de79 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -31,7 +31,6 @@ Import ('env') incs = '. ../editors/include ../makesdna ../makesrna ../blenfont ../blenlib ../blenkernel ../nodes' incs += ' ../imbuf ../blenloader ../bmesh ../gpu ../render/extern/include ../windowmanager' -incs += ' ../freestyle/intern/python' incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include #intern/cycles/blender' incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC'] @@ -102,6 +101,10 @@ if env['WITH_BF_CYCLES']: if env['WITH_BF_CYCLES_OSL']: defs.append('WITH_CYCLES_OSL') +if env['WITH_BF_FREESTYLE']: + incs += ' ../freestyle/intern/python' + defs.append('WITH_FREESTYLE') + if env['WITH_BF_GAMEENGINE']: defs.append('WITH_GAMEENGINE') -- cgit v1.2.3