diff options
author | Joseph Eagar <joeedh@gmail.com> | 2011-03-18 02:30:29 +0300 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2011-03-18 02:30:29 +0300 |
commit | bbbbea6024812f623f5faf7c15fb210d22c39b31 (patch) | |
tree | c8a7b62730bb7c1b24d46f5b5609c31b4a69448c /source/blender/editors/interface/SConscript | |
parent | baaf0d1b68541bace73aeac0747df3076138bcc5 (diff) |
scons fix
Diffstat (limited to 'source/blender/editors/interface/SConscript')
-rw-r--r-- | source/blender/editors/interface/SConscript | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript index e3b730e85c1..54390baadb9 100644 --- a/source/blender/editors/interface/SConscript +++ b/source/blender/editors/interface/SConscript @@ -7,13 +7,8 @@ for source in env.Glob('*_api.c'): sources.remove(source) incs = '../include ../../blenlib ../../blenfont ../../blenkernel ../../makesdna ../../imbuf' -<<<<<<< .working -incs += ' ../../makesrna ../../windowmanager ../../gpu ../../bmesh' -incs += ' #/intern/guardedalloc #/extern/glew/include' -======= incs += ' ../../makesrna ../../windowmanager #/intern/guardedalloc ../../gpu' -incs += ' #/extern/glew/include ../../blenloader' ->>>>>>> .merge-right.r35190 +incs += ' #/extern/glew/include ../../blenloader ../../bmesh' incs += ' ../../python/' # python button eval defs = [] |