svn merge ^/trunk/blender -r50023:50036
authorCampbell Barton <ideasman42@gmail.com>
Mon, 20 Aug 2012 10:16:22 +0000 (10:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 20 Aug 2012 10:16:22 +0000 (10:16 +0000)
1  2 
CMakeLists.txt
source/blender/makesrna/intern/rna_space.c

diff --cc CMakeLists.txt
@@@ -131,8 -131,8 +131,9 @@@ option(WITH_FFTW3         "Enable FFTW
  option(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
  option(WITH_GAMEENGINE    "Enable Game Engine" ON)
  option(WITH_PLAYER        "Build Player" OFF)
 +option(WITH_OPENCOLORIO   "Enable OpenColorIO color management" ON)
  option(WITH_COMPOSITOR    "Enable the tile based nodal compositor" ON)
+ option(WITH_COMPOSITOR_LEGACY "Enable legacy compositor" ON)
  
  # GHOST Windowing Library Options
  option(WITH_GHOST_DEBUG   "Enable debugging output for the GHOST library" OFF)