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:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-08-06 15:21:47 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-08-06 15:21:47 +0400
commitad5025ea258b0c7645e7c0da6fe37f0252599f1f (patch)
tree4d09afb79870b7365a9c6decb7afb95fd4df84c6 /source/blender/makesrna/SConscript
parentcf9dcb070931341612369700bc35262d87361c37 (diff)
Fix for an link error in makesrna with SCons. Reported by Thomas Dinges, thanks!
Also removed some leftover of the Freestyle trunk merger in the makesrna subdirectory.
Diffstat (limited to 'source/blender/makesrna/SConscript')
-rw-r--r--source/blender/makesrna/SConscript4
1 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript
index 3b322491559..2d0c4260c97 100644
--- a/source/blender/makesrna/SConscript
+++ b/source/blender/makesrna/SConscript
@@ -130,10 +130,6 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', '
if env['WITH_BF_INTERNATIONAL']:
defs.append('WITH_INTERNATIONAL')
-if env['WITH_BF_FREESTYLE']:
- incs += ' ../freestyle'
- defs.append('WITH_FREESTYLE')
-
rnalib = env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core','player'], priority = [165,20] )
Return ('rnalib')