svn merge ^/trunk/blender -r50023:50036

diff --cc CMakeLists.txt
index e33a24d4eab6a3db289cf554f9e1258e849315ca,338135f498758cc4ebeb491aaab0ca8297c42d31..77af06f6260c2dda9c4244d64f26d43cbcb411c2
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/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)

diff --cc source/blender/makesrna/intern/rna_space.c
Simple merge