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/modifiers/SConscript | |
| parent | baaf0d1b68541bace73aeac0747df3076138bcc5 (diff) | |
scons fix
Diffstat (limited to 'source/blender/modifiers/SConscript')
| -rw-r--r-- | source/blender/modifiers/SConscript | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index c4196222ec8..d2f6580b593 100644 --- a/source/blender/modifiers/SConscript +++ b/source/blender/modifiers/SConscript @@ -5,11 +5,7 @@ sources = env.Glob('intern/*.c') incs = '. ./intern' incs += ' #/intern/guardedalloc #/intern/decimation/extern #/intern/bsp/extern #/intern/elbeem/extern' -<<<<<<< .working -incs += ' ../render/extern/include ../bmesh' -======= -incs += ' ../render/extern/include ../blenloader' ->>>>>>> .merge-right.r35190 +incs += ' ../render/extern/include ../blenloader ../bmesh' incs += ' ../include ../blenlib ../makesdna ../blenkernel ../blenkernel/intern' incs += ' ' + env['BF_ZLIB_INC'] |