From bbbbea6024812f623f5faf7c15fb210d22c39b31 Mon Sep 17 00:00:00 2001 From: Joseph Eagar Date: Thu, 17 Mar 2011 23:30:29 +0000 Subject: scons fix --- source/blender/render/SConscript | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'source/blender/render/SConscript') 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'] -- cgit v1.2.3