Merged changes in the trunk up to revision 36757.

2011-05-19 01:40:37 +00:00
parent 31471f644c c04f9b779c
commit dfcd015535
275 changed files with 4189 additions and 3664 deletions
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -78,10 +78,6 @@ if env['OURPLATFORM'] == 'darwin':
 if env['BF_NO_ELBEEM']:
    defs.append('DISABLE_ELBEEM')

-if env['WITH_BF_LCMS']:
-    defs.append('WITH_LCMS')
-    incs += ' ' + env['BF_LCMS_INC']
-
 if env['WITH_BF_LZO']:
    incs += ' #/extern/lzo/minilzo'
    defs.append('WITH_LZO')