[Bf-blender-cvs] [30f013c] hair_system: Fixed missing scons include folders for Bullet in the hair code.
Lukas Tönne
noreply at git.blender.org
Thu Aug 7 23:43:07 CEST 2014
Commit: 30f013c2c6630ced2854b34b1e893dbd928a123b
Author: Lukas Tönne
Date: Thu Aug 7 23:43:40 2014 +0200
Branches: hair_system
https://developer.blender.org/rB30f013c2c6630ced2854b34b1e893dbd928a123b
Fixed missing scons include folders for Bullet in the hair code.
===================================================================
M source/blender/hair/SConscript
===================================================================
diff --git a/source/blender/hair/SConscript b/source/blender/hair/SConscript
index 53c147d..e78c14a 100644
--- a/source/blender/hair/SConscript
+++ b/source/blender/hair/SConscript
@@ -38,11 +38,16 @@ incs = [
'../blenlib',
'../makesdna',
'#/intern/guardedalloc',
+ '#/intern/rigidbody',
+ '#/extern/bullet2/src',
]
incs = ' '.join(incs)
defs = ['HAIR_NAMESPACE=hair', 'HAIR_NAMESPACE_BEGIN=namespace hair {', 'HAIR_NAMESPACE_END=}']
+if env['WITH_BF_BULLET']:
+ defs.append('WITH_BULLET')
+
if env['WITH_BF_PYTHON']:
incs += ' ' + env['BF_PYTHON_INC']
incs += ' ../python'
More information about the Bf-blender-cvs
mailing list