[Bf-blender-cvs] [ae9ba6c] hair_system: Fix for scons error: Was missing an opening bracket for the hair namespace define.
Lukas Tönne
noreply at git.blender.org
Sat Aug 2 11:09:36 CEST 2014
Commit: ae9ba6ce4abb3c0ba89f0c54a13675b6052b5e47
Author: Lukas Tönne
Date: Sat Aug 2 10:52:55 2014 +0200
Branches: hair_system
https://developer.blender.org/rBae9ba6ce4abb3c0ba89f0c54a13675b6052b5e47
Fix for scons error: Was missing an opening bracket for the hair
namespace define.
===================================================================
M source/blender/hair/SConscript
===================================================================
diff --git a/source/blender/hair/SConscript b/source/blender/hair/SConscript
index 29f4062..53c147d 100644
--- a/source/blender/hair/SConscript
+++ b/source/blender/hair/SConscript
@@ -33,7 +33,7 @@ sources += env.Glob('intern/*.cpp')
incs = [
'.',
- './intern',
+ 'intern',
'../blenkernel',
'../blenlib',
'../makesdna',
@@ -41,7 +41,7 @@ incs = [
]
incs = ' '.join(incs)
-defs = ['HAIR_NAMESPACE=hair', 'HAIR_NAMESPACE_BEGIN=namespace hair', 'HAIR_NAMESPACE_END=}']
+defs = ['HAIR_NAMESPACE=hair', 'HAIR_NAMESPACE_BEGIN=namespace hair {', 'HAIR_NAMESPACE_END=}']
if env['WITH_BF_PYTHON']:
incs += ' ' + env['BF_PYTHON_INC']
More information about the Bf-blender-cvs
mailing list