diff options
Diffstat (limited to 'source/blender/editors/gpencil/SConscript')
| -rw-r--r-- | source/blender/editors/gpencil/SConscript | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/gpencil/SConscript b/source/blender/editors/gpencil/SConscript index baed179cbe9..e75e3f032c1 100644 --- a/source/blender/editors/gpencil/SConscript +++ b/source/blender/editors/gpencil/SConscript @@ -5,7 +5,11 @@ 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 += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' env.BlenderLib ( 'bf_editors_gpencil', sources, Split(incs), [], libtype=['core'], priority=[45] ) |