Blender Git Loki

Git Commits -> Revision a73dd34

Revision a73dd34 by Sergey Sharybin (master)
September 15, 2012, 10:05 (GMT)
Color Management, Stage 2: Switch color pipeline to use OpenColorIO

Replace old color pipeline which was supporting linear/sRGB color spaces
only with OpenColorIO-based pipeline.

This introduces two configurable color spaces:

- Input color space for images and movie clips. This space is used to convert
images/movies from color space in which file is saved to Blender's linear
space (for float images, byte images are not internally converted, only input
space is stored for such images and used later).

This setting could be found in image/clip data block settings.

- Display color space which defines space in which particular display is working.

This settings could be found in scene's Color Management panel.

When render result is being displayed on the screen, apart from converting image
to display space, some additional conversions could happen.

This conversions are:

- View, which defines tone curve applying before display transformation.
These are different ways to view the image on the same display device.
For example it could be used to emulate film view on sRGB display.

- Exposure affects on image exposure before tone map is applied.

- Gamma is post-display gamma correction, could be used to match particular
display gamma.

- RGB curves are user-defined curves which are applying before display
transformation, could be used for different purposes.

All this settings by default are only applying on render result and does not
affect on other images. If some particular image needs to be affected by this
transformation, "View as Render" setting of image data block should be set to
truth. Movie clips are always affected by all display transformations.

This commit also introduces configurable color space in which sequencer is
working. This setting could be found in scene's Color Management panel and
it should be used if such stuff as grading needs to be done in color space
different from sRGB (i.e. when Film view on sRGB display is use, using VD16
space as sequencer's internal space would make grading working in space
which is close to the space using for display).

Some technical notes:

- Image buffer's float buffer is now always in linear space, even if it was
created from 16bit byte images.

- Space of byte buffer is stored in image buffer's rect_colorspace property.

- Profile of image buffer was removed since it's not longer meaningful.

- OpenGL and GLSL is supposed to always work in sRGB space. It is possible
to support other spaces, but it's quite large project which isn't so
much important.

- Legacy Color Management option disabled is emulated by using None display.
It could have some regressions, but there's no clear way to avoid them.

- If OpenColorIO is disabled on build time, it should make blender behaving
in the same way as previous release with color management enabled.

More details could be found at this page (more details would be added soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management

--
Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO
integration and to Brecht van Lommel for some further development and code/
usecase review!

Commit Details:

Full Hash: a73dd3476e7d180d3320afc04d218ce22f2f3bfc
SVN Revision: 50628
Parent Commit: b93da9b
Lines Changed: +5024, -1186

3 Added Paths:

/source/blender/imbuf/IMB_colormanagement.h (+155, -0) (View)
/source/blender/imbuf/intern/colormanagement.c (+2337, -0) (View)
/source/blender/imbuf/intern/IMB_colormanagement_intern.h (+92, -0) (View)

175 Modified Paths:

/release/scripts/startup/bl_ui/properties_render.py (+2, -5) (Diff)
/release/scripts/startup/bl_ui/properties_scene.py (+26, -0) (Diff)
/release/scripts/startup/bl_ui/space_sequencer.py (+2, -0) (Diff)
/source/blender/blenfont/BLF_api.h (+2, -1) (Diff)
/source/blender/blenfont/CMakeLists.txt (+1, -0) (Diff)
/source/blender/blenfont/intern/blf.c (+2, -3) (Diff)
/source/blender/blenfont/intern/blf_font.c (+6, -3) (Diff)
/source/blender/blenfont/intern/blf_internal_types.h (+2, -2) (Diff)
/source/blender/blenfont/SConscript (+1, -1) (Diff)
/source/blender/blenkernel/BKE_blender.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_colortools.h (+21, -2) (Diff)
/source/blender/blenkernel/BKE_image.h (+4, -1) (Diff)
/source/blender/blenkernel/BKE_node.h (+4, -1) (Diff)
/source/blender/blenkernel/BKE_scene.h (+2, -0) (Diff)
/source/blender/blenkernel/BKE_sequencer.h (+11, -1) (Diff)
/source/blender/blenkernel/intern/blender.c (+7, -1) (Diff)
/source/blender/blenkernel/intern/colortools.c (+81, -11) (Diff)
/source/blender/blenkernel/intern/image.c (+54, -26) (Diff)
/source/blender/blenkernel/intern/image_gen.c (+5, -1) (Diff)
/source/blender/blenkernel/intern/movieclip.c (+12, -3) (Diff)
/source/blender/blenkernel/intern/ocean.c (+4, -5) (Diff)
/source/blender/blenkernel/intern/scene.c (+40, -0) (Diff)
/source/blender/blenkernel/intern/seqeffects.c (+5, -4) (Diff)
/source/blender/blenkernel/intern/seqmodifier.c (+9, -0) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+114, -21) (Diff)
/source/blender/blenkernel/intern/tracking.c (+0, -3) (Diff)
/source/blender/blenkernel/SConscript (+7, -0) (Diff)
/source/blender/blenlib/BLI_threads.h (+1, -0) (Diff)
/source/blender/blenlib/intern/threads.c (+5, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+58, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+10, -1) (Diff)
/source/blender/collada/ImageExporter.cpp (+1, -1) (Diff)
/source/blender/compositor/COM_compositor.h (+14, -1) (Diff)
/source/blender/compositor/intern/COM_compositor.cpp (+5, -3) (Diff)
/source/blender/compositor/intern/COM_CompositorContext.cpp (+2, -10) (Diff)
/source/blender/compositor/intern/COM_CompositorContext.h (+24, -2) (Diff)
/source/blender/compositor/intern/COM_ExecutionSystem.cpp (+5, -1) (Diff)
/source/blender/compositor/intern/COM_ExecutionSystem.h (+3, -1) (Diff)
/source/blender/compositor/intern/COM_Node.cpp (+4, -4) (Diff)
/source/blender/compositor/intern/COM_Node.h (+2, -2) (Diff)
/source/blender/compositor/nodes/COM_BlurNode.cpp (+4, -4) (Diff)
/source/blender/compositor/nodes/COM_BokehImageNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_ColorMatteNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_CompositorNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_DespeckleNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_DilateErodeNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_FilterNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_ImageNode.cpp (+2, -2) (Diff)
/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_MixNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_MovieClipNode.cpp (+3, -19) (Diff)
/source/blender/compositor/nodes/COM_OutputFileNode.cpp (+4, -3) (Diff)
/source/blender/compositor/nodes/COM_RenderLayersNode.cpp (+31, -31) (Diff)
/source/blender/compositor/nodes/COM_RenderLayersNode.h (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_SplitViewerNode.cpp (+4, -3) (Diff)
/source/blender/compositor/nodes/COM_TextureNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_ViewerNode.cpp (+4, -3) (Diff)
/source/blender/compositor/operations/COM_ImageOperation.cpp (+1, -0) (Diff)
/source/blender/compositor/operations/COM_OutputFileOperation.cpp (+9, -3) (Diff)
/source/blender/compositor/operations/COM_OutputFileOperation.h (+6, -1) (Diff)
/source/blender/compositor/operations/COM_PreviewOperation.cpp (+11, -2) (Diff)
/source/blender/compositor/operations/COM_PreviewOperation.h (+4, -1) (Diff)
/source/blender/compositor/operations/COM_SplitViewerOperation.cpp (+1, -17) (Diff)
/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp (+23, -8) (Diff)
/source/blender/compositor/operations/COM_ViewerBaseOperation.h (+7, -6) (Diff)
/source/blender/compositor/operations/COM_ViewerOperation.cpp (+1, -15) (Diff)
/source/blender/editors/include/ED_clip.h (+1, -1) (Diff)
/source/blender/editors/include/ED_image.h (+2, -1) (Diff)
/source/blender/editors/include/ED_view3d.h (+5, -3) (Diff)
/source/blender/editors/include/UI_interface.h (+4, -1) (Diff)
/source/blender/editors/interface/interface.c (+29, -1) (Diff)
/source/blender/editors/interface/interface_draw.c (+9, -4) (Diff)
/source/blender/editors/interface/interface_handlers.c (+18, -12) (Diff)
/source/blender/editors/interface/interface_icons.c (+3, -3) (Diff)
/source/blender/editors/interface/interface_intern.h (+9, -0) (Diff)
/source/blender/editors/interface/interface_ops.c (+13, -7) (Diff)
/source/blender/editors/interface/interface_regions.c (+19, -12) (Diff)
/source/blender/editors/interface/interface_templates.c (+53, -0) (Diff)
/source/blender/editors/interface/interface_widgets.c (+15, -11) (Diff)
/source/blender/editors/object/object_bake.c (+8, -2) (Diff)
/source/blender/editors/render/render_internal.c (+5, -13) (Diff)
/source/blender/editors/render/render_opengl.c (+61, -29) (Diff)
/source/blender/editors/render/render_preview.c (+29, -9) (Diff)
/source/blender/editors/screen/screendump.c (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_image.c (+24, -23) (Diff)
/source/blender/editors/space_clip/clip_buttons.c (+5, -0) (Diff)
/source/blender/editors/space_clip/clip_draw.c (+12, -13) (Diff)
/source/blender/editors/space_clip/clip_editor.c (+20, -15) (Diff)
/source/blender/editors/space_file/filelist.c (+1, -1) (Diff)
/source/blender/editors/space_image/image_buttons.c (+29, -52) (Diff)
/source/blender/editors/space_image/image_draw.c (+76, -51) (Diff)
/source/blender/editors/space_image/image_intern.h (+1, -1) (Diff)
/source/blender/editors/space_image/image_ops.c (+99, -27) (Diff)
/source/blender/editors/space_image/space_image.c (+5, -8) (Diff)
/source/blender/editors/space_node/drawnode.c (+15, -14) (Diff)
/source/blender/editors/space_node/node_draw.c (+1, -3) (Diff)
/source/blender/editors/space_node/node_edit.c (+3, -2) (Diff)
/source/blender/editors/space_node/node_intern.h (+1, -1) (Diff)
/source/blender/editors/space_node/node_view.c (+7, -12) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+106, -27) (Diff)
/source/blender/editors/space_sequencer/sequencer_scopes.c (+41, -9) (Diff)
/source/blender/editors/space_sequencer/sequencer_view.c (+11, -2) (Diff)
/source/blender/editors/space_sequencer/space_sequencer.c (+48, -4) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+9, -1) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+43, -14) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+10, -5) (Diff)
/source/blender/gpu/intern/gpu_material.c (+6, -2) (Diff)
/source/blender/imbuf/CMakeLists.txt (+7, -0) (Diff)
/source/blender/imbuf/IMB_imbuf.h (+11, -9) (Diff)
/source/blender/imbuf/IMB_imbuf_types.h (+11, -5) (Diff)
/source/blender/imbuf/intern/allocimbuf.c (+13, -3) (Diff)
/source/blender/imbuf/intern/anim_movie.c (+27, -10) (Diff)
/source/blender/imbuf/intern/bmp.c (+6, -2) (Diff)
/source/blender/imbuf/intern/cineon/cineon_dpx.c (+10, -5) (Diff)
/source/blender/imbuf/intern/dds/dds_api.cpp (+10, -2) (Diff)
/source/blender/imbuf/intern/dds/dds_api.h (+3, -1) (Diff)
/source/blender/imbuf/intern/divers.c (+42, -95) (Diff)
/source/blender/imbuf/intern/filetype.c (+16, -14) (Diff)
/source/blender/imbuf/intern/IMB_anim.h (+1, -0) (Diff)
/source/blender/imbuf/intern/IMB_filetype.h (+13, -12) (Diff)
/source/blender/imbuf/intern/indexer.c (+2, -1) (Diff)
/source/blender/imbuf/intern/iris.c (+7, -2) (Diff)
/source/blender/imbuf/intern/jp2.c (+46, -109) (Diff)
/source/blender/imbuf/intern/jpeg.c (+7, -3) (Diff)
/source/blender/imbuf/intern/openexr/openexr_api.cpp (+14, -27) (Diff)
/source/blender/imbuf/intern/openexr/openexr_api.h (+1, -1) (Diff)
/source/blender/imbuf/intern/png.c (+19, -22) (Diff)
/source/blender/imbuf/intern/radiance_hdr.c (+6, -2) (Diff)
/source/blender/imbuf/intern/readimage.c (+30, -8) (Diff)
/source/blender/imbuf/intern/rectop.c (+8, -8) (Diff)
/source/blender/imbuf/intern/targa.c (+6, -3) (Diff)
/source/blender/imbuf/intern/thumbs.c (+6, -5) (Diff)
/source/blender/imbuf/intern/tiff.c (+8, -7) (Diff)
/source/blender/imbuf/intern/writeimage.c (+31, -5) (Diff)
/source/blender/imbuf/SConscript (+2, -2) (Diff)
/source/blender/makesdna/DNA_color_types.h (+21, -1) (Diff)
/source/blender/makesdna/DNA_image_types.h (+5, -0) (Diff)
/source/blender/makesdna/DNA_movieclip_types.h (+4, -0) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+10, -1) (Diff)
/source/blender/makesdna/DNA_sequence_types.h (+13, -0) (Diff)
/source/blender/makesdna/DNA_space_types.h (+6, -2) (Diff)
/source/blender/makesrna/intern/rna_color.c (+239, -3) (Diff)
/source/blender/makesrna/intern/rna_image.c (+10, -0) (Diff)
/source/blender/makesrna/intern/rna_image_api.c (+12, -8) (Diff)
/source/blender/makesrna/intern/rna_movieclip.c (+6, -0) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+27, -33) (Diff)
/source/blender/makesrna/intern/rna_sequencer.c (+5, -0) (Diff)
/source/blender/makesrna/intern/rna_sequencer_api.c (+2, -1) (Diff)
/source/blender/makesrna/intern/rna_space.c (+1, -20) (Diff)
/source/blender/makesrna/intern/rna_ui_api.c (+12, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+3, -0) (Diff)
/source/blender/nodes/composite/nodes/node_composite_image.c (+8, -21) (Diff)
/source/blender/nodes/composite/nodes/node_composite_outputFile.c (+0, -3) (Diff)
/source/blender/nodes/composite/node_composite_tree.c (+6, -2) (Diff)
/source/blender/nodes/composite/node_composite_util.c (+3, -0) (Diff)
/source/blender/quicktime/apple/qtkit_import.m (+0, -1) (Diff)
/source/blender/quicktime/apple/quicktime_import.c (+0, -2) (Diff)
/source/blender/render/intern/include/render_result.h (+5, -1) (Diff)
/source/blender/render/intern/source/envmap.c (+0, -3) (Diff)
/source/blender/render/intern/source/pipeline.c (+45, -15) (Diff)
/source/blender/render/intern/source/rendercore.c (+10, -4) (Diff)
/source/blender/render/intern/source/render_result.c (+14, -27) (Diff)
/source/blender/render/intern/source/render_texture.c (+11, -10) (Diff)
/source/blender/render/intern/source/shadeinput.c (+8, -1) (Diff)
/source/blender/windowmanager/intern/wm_files.c (+2, -2) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+6, -3) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_playanim.c (+13, -7) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+2, -0) (Diff)
/source/blenderplayer/CMakeLists.txt (+1, -0) (Diff)
/source/creator/CMakeLists.txt (+21, -0) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021