diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-02-20 02:51:18 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-02-20 02:51:18 +0300 |
| commit | 70aa63306ad3ec1402275ed623b745d06d14db18 (patch) | |
| tree | 08cea0cd3818061afc4f3a3b7b922ac668ca80ae /source/blender/render/SConscript | |
| parent | 3789c398ff2b2fd7f0eadba45686b0e235186f4a (diff) | |
| parent | 43d362fcc8592cede760a56cf863a0c3eb80ff5f (diff) | |
Merged changes in the trunk up to revision 34996.
Conflicts resolved:
C:\bf-blender\soc-2008-mxcurioni\doc\python_api\sphinx_doc_gen.py
C:\bf-blender\soc-2008-mxcurioni\source\blender\makesrna\RNA_types.h
C:\bf-blender\soc-2008-mxcurioni\source\blender\render\SConscript
Diffstat (limited to 'source/blender/render/SConscript')
| -rw-r--r-- | source/blender/render/SConscript | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index 6d44c86fa86..d751c90ba27 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -6,7 +6,8 @@ raysources = env.Glob('intern/raytrace/*.cpp') incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna ../makesrna' incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf' -incs += ' ../include ../blenloader ../freestyle ../../../intern/smoke/extern' +incs += ' ../include ../blenloader ../../../intern/smoke/extern ../../../intern/mikktspace' +incs += ' ../freestyle' cflags_raytrace = env['CCFLAGS'] cxxflags_raytrace = env['CXXFLAGS'] |