diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-03-18 02:39:26 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-03-18 02:39:26 +0300 |
| commit | 18494f8d33d09140c6e57e39dafb397fbba324bd (patch) | |
| tree | 99e1c011c439af41a3fa4f45e2e3aee5a8d2b23f /source/blender/modifiers/SConscript | |
| parent | 3cb70bd2c51a472be274d71b32e388a8f293bc50 (diff) | |
scons fix
Diffstat (limited to 'source/blender/modifiers/SConscript')
| -rw-r--r-- | source/blender/modifiers/SConscript | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index d2f6580b593..9f13aa15851 100644 --- a/source/blender/modifiers/SConscript +++ b/source/blender/modifiers/SConscript @@ -21,8 +21,5 @@ if env['BF_NO_ELBEEM']: env.BlenderLib ( libname = 'bf_modifiers', sources = sources, includes = Split(incs), defines=defs, -<<<<<<< .working - libtype=['core','player'], priority = [161, 20] ) -======= libtype=['core','player'], priority = [80, 40] ) ->>>>>>> .merge-right.r35190 + |