diff options
Diffstat (limited to 'source/blender/editors/space_buttons/SConscript')
-rw-r--r-- | source/blender/editors/space_buttons/SConscript | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/space_buttons/SConscript b/source/blender/editors/space_buttons/SConscript index b82f0db49a0..38a65cadfab 100644 --- a/source/blender/editors/space_buttons/SConscript +++ b/source/blender/editors/space_buttons/SConscript @@ -5,7 +5,11 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' +<<<<<<< .working incs += ' ../../makesrna ../../render/extern/include ../../bmesh' +======= +incs += ' ../../makesrna ../../render/extern/include ../../blenloader' +>>>>>>> .merge-right.r35190 defs = [] |