diff options
Diffstat (limited to 'source/blender/render/SConscript')
-rw-r--r-- | source/blender/render/SConscript | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index d471025c7da..03819f034eb 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -6,11 +6,7 @@ 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 +incs += ' ../include ../blenloader ../../../intern/smoke/extern ../../../intern/mikktspace ../bmesh' cflags_raytrace = env['CCFLAGS'] cxxflags_raytrace = env['CXXFLAGS'] |