Blender Git Loki
Git Commits -> Revision b93da9b
Revision b93da9b by Sergey Sharybin (master) September 15, 2012, 10:03 (GMT) |
Color Management, Stage 1: Initial OpenColorIO library integration This commit integrates support of OpenColorIO library into build systems. It also contains C-API for OpenColorIO library which could be used by Blender. CMake has got find rules familiar to OpenImageIO's one which makes it easier for build system to find needed libraries and includes. Scons only could use explicitly defined paths to libraries and includes. C-API would be compiled and Blender would be linked against C-API and OpenColorIO but it wouldn't affect on Blender behavior at all. OpenColorIO could be disabled by setting up WITH_OCIO to Off in CMake and setting WITH_BF_OCIO in Scons. |
Commit Details:
Full Hash: b93da9b01e163158a830872d29f8bd874f63d54d
SVN Revision: 50627
Parent Commit: 8add19d
Lines Changed: +381405, -0
25 Added Paths:
/build_files/cmake/Modules/FindOpenColorIO.cmake (+85, -0) (View)
/intern/opencolorio/CMakeLists.txt (+62, -0) (View)
/intern/opencolorio/ocio_capi.cpp (+525, -0) (View)
/intern/opencolorio/ocio_capi.h (+128, -0) (View)
/intern/opencolorio/ocio_capi_stub.cpp (+380, -0) (View)
/intern/opencolorio/SConscript (+19, -0) (View)
/release/datafiles/colormanagement/config.ocio (+284, -0) (View)
/release/datafiles/colormanagement/luts/aces_to_xyz.spimtx (+3, -0) (View)
/release/datafiles/colormanagement/luts/adx_adx10_to_cdd.spimtx (+4, -0) (View)
/release/datafiles/colormanagement/luts/adx_cdd_to_cid.spimtx (+4, -0) (View)
/release/datafiles/colormanagement/luts/adx_cid_to_rle.spi1d (+4102, -0) (View)
/release/datafiles/colormanagement/luts/adx_exp_to_aces.spimtx (+4, -0) (View)
/release/datafiles/colormanagement/luts/colorworks_filmlg_to_p3.3dl (+4916, -0) (View)
/release/datafiles/colormanagement/luts/dci_xyz.spi1d (+65542, -0) (View)
/release/datafiles/colormanagement/luts/lg10.spi1d (+2054, -0) (View)
/release/datafiles/colormanagement/luts/rec709.spi1d (+4107, -0) (View)
/release/datafiles/colormanagement/luts/rec709_to_aces.spimtx (+3, -0) (View)
/release/datafiles/colormanagement/luts/rrt_ut33_dcdm.spi3d (+32771, -0) (View)
/release/datafiles/colormanagement/luts/rrt_ut33_p3dci.spi3d (+32771, -0) (View)
/release/datafiles/colormanagement/luts/rrt_ut33_rec709.spi3d (+32771, -0) (View)
/release/datafiles/colormanagement/luts/rrt_ut33_sRGB.spi3d (+32771, -0) (View)
/release/datafiles/colormanagement/luts/spi_ocio_srgb_test.spi3d (+32771, -0) (View)
/release/datafiles/colormanagement/luts/srgb.spi1d (+4107, -0) (View)
/release/datafiles/colormanagement/luts/srgb_to_xyz.spimtx (+3, -0) (View)
/release/datafiles/colormanagement/luts/vd16.spi1d (+131079, -0) (View)
/intern/opencolorio/CMakeLists.txt (+62, -0) (View)
/intern/opencolorio/ocio_capi.cpp (+525, -0) (View)
/intern/opencolorio/ocio_capi.h (+128, -0) (View)
/intern/opencolorio/ocio_capi_stub.cpp (+380, -0) (View)
/intern/opencolorio/SConscript (+19, -0) (View)
/release/datafiles/colormanagement/config.ocio (+284, -0) (View)
/release/datafiles/colormanagement/luts/aces_to_xyz.spimtx (+3, -0) (View)
/release/datafiles/colormanagement/luts/adx_adx10_to_cdd.spimtx (+4, -0) (View)
/release/datafiles/colormanagement/luts/adx_cdd_to_cid.spimtx (+4, -0) (View)
/release/datafiles/colormanagement/luts/adx_cid_to_rle.spi1d (+4102, -0) (View)
/release/datafiles/colormanagement/luts/adx_exp_to_aces.spimtx (+4, -0) (View)
/release/datafiles/colormanagement/luts/colorworks_filmlg_to_p3.3dl (+4916, -0) (View)
/release/datafiles/colormanagement/luts/dci_xyz.spi1d (+65542, -0) (View)
/release/datafiles/colormanagement/luts/lg10.spi1d (+2054, -0) (View)
/release/datafiles/colormanagement/luts/rec709.spi1d (+4107, -0) (View)
/release/datafiles/colormanagement/luts/rec709_to_aces.spimtx (+3, -0) (View)
/release/datafiles/colormanagement/luts/rrt_ut33_dcdm.spi3d (+32771, -0) (View)
/release/datafiles/colormanagement/luts/rrt_ut33_p3dci.spi3d (+32771, -0) (View)
/release/datafiles/colormanagement/luts/rrt_ut33_rec709.spi3d (+32771, -0) (View)
/release/datafiles/colormanagement/luts/rrt_ut33_sRGB.spi3d (+32771, -0) (View)
/release/datafiles/colormanagement/luts/spi_ocio_srgb_test.spi3d (+32771, -0) (View)
/release/datafiles/colormanagement/luts/srgb.spi1d (+4107, -0) (View)
/release/datafiles/colormanagement/luts/srgb_to_xyz.spimtx (+3, -0) (View)
/release/datafiles/colormanagement/luts/vd16.spi1d (+131079, -0) (View)
13 Modified Paths:
/build_files/cmake/macros.cmake (+6, -0) (Diff)
/build_files/scons/config/darwin-config.py (+6, -0) (Diff)
/build_files/scons/config/linux-config.py (+10, -0) (Diff)
/build_files/scons/config/win32-mingw-config.py (+6, -0) (Diff)
/build_files/scons/config/win32-vc-config.py (+6, -0) (Diff)
/build_files/scons/config/win64-mingw-config.py (+6, -0) (Diff)
/build_files/scons/config/win64-vc-config.py (+7, -0) (Diff)
/build_files/scons/tools/Blender.py (+12, -0) (Diff)
/build_files/scons/tools/btools.py (+9, -0) (Diff)
/CMakeLists.txt (+44, -0) (Diff)
/intern/CMakeLists.txt (+2, -0) (Diff)
/intern/SConscript (+2, -0) (Diff)
/SConstruct (+23, -0) (Diff)
/build_files/scons/config/darwin-config.py (+6, -0) (Diff)
/build_files/scons/config/linux-config.py (+10, -0) (Diff)
/build_files/scons/config/win32-mingw-config.py (+6, -0) (Diff)
/build_files/scons/config/win32-vc-config.py (+6, -0) (Diff)
/build_files/scons/config/win64-mingw-config.py (+6, -0) (Diff)
/build_files/scons/config/win64-vc-config.py (+7, -0) (Diff)
/build_files/scons/tools/Blender.py (+12, -0) (Diff)
/build_files/scons/tools/btools.py (+9, -0) (Diff)
/CMakeLists.txt (+44, -0) (Diff)
/intern/CMakeLists.txt (+2, -0) (Diff)
/intern/SConscript (+2, -0) (Diff)
/SConstruct (+23, -0) (Diff)