svn merge -r36672:36725 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-17 07:03:12 +00:00
parent 2a12e8b7e4 1294504603
commit 4514be8f4f
93 changed files with 1438 additions and 1042 deletions
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -79,10 +79,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')