Merging r49499 through r49518 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 3 Aug 2012 09:08:40 +0000 (09:08 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 3 Aug 2012 09:08:40 +0000 (09:08 +0000)
14 files changed:
1  2 
CMakeLists.txt
build_files/scons/tools/btools.py
intern/CMakeLists.txt
intern/SConscript
source/blender/blenkernel/intern/image.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_node/node_intern.h
source/blender/editors/space_node/space_node.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/pipeline.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
index 2d52536710fbec2c5ec5307b9b0dcacb8b79b281,034d261e7cdb7e52f64a2adb9b7fefef1e5f4270..570048495a64d3d518e30e10954c77494d40e157
@@@ -163,9 -163,8 +163,9 @@@ def validate_arguments(args, bc)
              'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC',
              'WITH_BF_CYCLES', 'WITH_BF_CYCLES_CUDA_BINARIES', 'BF_CYCLES_CUDA_NVCC', 'BF_CYCLES_CUDA_NVCC', 'WITH_BF_CYCLES_CUDA_THREADED_COMPILE',
              'WITH_BF_OIIO', 'WITH_BF_STATICOIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIB_STATIC', 'BF_OIIO_LIBPATH',
 +            'WITH_BF_OCIO', 'WITH_BF_STATICOCIO', 'BF_OCIO', 'BF_OCIO_INC', 'BF_OCIO_LIB', 'BF_OCIO_LIB_STATIC', 'BF_OCIO_LIBPATH',
              'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH',
-             'WITH_BF_LIBMV', 'WITH_BF_CARVE'
+             'WITH_BF_LIBMV'
              ]
      
      # Have options here that scons expects to be lists
Simple merge
Simple merge
index 49bb24c9c1fc56222b689f546999ce4e620a3d20,8a06d14033ff463e2ec986e1d0479bf91c74d061..7b55560dca60bf0fd0c594178b6cab74cbd91511
  #include "WM_api.h"
  #include "WM_types.h"
  
- #include "UI_interface.h"
  #include "UI_resources.h"
  
 +#include "IMB_colormanagement.h"
  #include "IMB_imbuf.h"
  #include "IMB_imbuf_types.h"
  
index 7f860981c7a097c9e05bd06df66d948856f58e3b,af301bce94209f879b265a78ad8cb36304ebe1e9..0dcd657326179dc747c6c05b90dfb90f190022b0
  
  #include "BLI_blenlib.h"
  #include "BLI_math.h"
- #include "BLI_rand.h"
- #include "BLI_utildefines.h"
  
 +#include "BKE_colortools.h"
  #include "BKE_context.h"
  #include "BKE_screen.h"
  #include "BKE_node.h"
Simple merge
Simple merge