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/editors/gpencil/SConscript | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'source/blender/editors/gpencil/SConscript') diff --git a/source/blender/editors/gpencil/SConscript b/source/blender/editors/gpencil/SConscript index e75e3f032c1..6c23e77208a 100644 --- a/source/blender/editors/gpencil/SConscript +++ b/source/blender/editors/gpencil/SConscript @@ -5,11 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -<<<<<<< .working -incs += ' ../../gpu ../../bmesh' -======= -incs += ' ../../gpu ../../blenloader' ->>>>>>> .merge-right.r35190 +incs += ' ../../gpu ../../blenloader ../../bmesh' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' env.BlenderLib ( 'bf_editors_gpencil', sources, Split(incs), [], libtype=['core'], priority=[45] ) -- cgit v1.2.3