diff options
Diffstat (limited to 'source/blender/render/SConscript')
| -rw-r--r-- | source/blender/render/SConscript | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index 479c9d1ad40..d471025c7da 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -6,7 +6,11 @@ raysources = env.Glob('intern/raytrace/*.cpp') incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna ../makesrna' incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf' +<<<<<<< .working incs += ' ../include ../blenloader ../../../intern/smoke/extern ../bmesh' +======= +incs += ' ../include ../blenloader ../../../intern/smoke/extern ../../../intern/mikktspace' +>>>>>>> .merge-right.r35190 cflags_raytrace = env['CCFLAGS'] cxxflags_raytrace = env['CXXFLAGS'] |