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/sculpt_paint/SConscript | |
| parent | baaf0d1b68541bace73aeac0747df3076138bcc5 (diff) | |
scons fix
Diffstat (limited to 'source/blender/editors/sculpt_paint/SConscript')
| -rw-r--r-- | source/blender/editors/sculpt_paint/SConscript | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/editors/sculpt_paint/SConscript b/source/blender/editors/sculpt_paint/SConscript index 6c1fe79d8bc..829a2760d1a 100644 --- a/source/blender/editors/sculpt_paint/SConscript +++ b/source/blender/editors/sculpt_paint/SConscript @@ -8,11 +8,7 @@ defs = [] incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../render/extern/include' -<<<<<<< .working -incs += ' ../../gpu ../../makesrna ../../bmesh' -======= -incs += ' ../../gpu ../../makesrna ../../blenloader' ->>>>>>> .merge-right.r35190 +incs += ' ../../gpu ../../makesrna ../../blenloader ../../bmesh' if env['OURPLATFORM'] == 'linux2': cflags='-pthread' |