diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-05-23 07:24:15 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-05-23 07:24:15 +0400 |
| commit | f026266e185f90543138a856898f50b2295a12fc (patch) | |
| tree | f674a1a1b328a423ec4bdcdc4a11f35e56669e7a /source/blender/editors/space_view3d/SConscript | |
| parent | b7fe3258b66698f62f630d0b18431b54b65101ed (diff) | |
merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.
[[Split portion of a mixed commit.]]
Diffstat (limited to 'source/blender/editors/space_view3d/SConscript')
| -rw-r--r-- | source/blender/editors/space_view3d/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript index 83d0d136566..c4ca73cffbd 100644 --- a/source/blender/editors/space_view3d/SConscript +++ b/source/blender/editors/space_view3d/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' ../../render/extern/include #/intern/guardedalloc #intern/bmfont' -incs += ' ../../gpu ../../makesrna ../../bmesh' +incs += ' ../../render/extern/include #/intern/guardedalloc' +incs += ' ../../gpu ../../makesrna ../../blenfont ../../bmesh ' env.BlenderLib ( 'bf_editors_space_view3d', sources, Split(incs), [], libtype=['core'], priority=[40] ) |