[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50628] trunk/blender: Color Management, Stage 2: Switch color pipeline to use OpenColorIO
Sergey Sharybin
sergey.vfx at gmail.com
Sat Sep 15 12:05:07 CEST 2012
Revision: 50628
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50628
Author: nazgul
Date: 2012-09-15 10:05:07 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
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!
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/properties_render.py
trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
trunk/blender/source/blender/blenfont/BLF_api.h
trunk/blender/source/blender/blenfont/CMakeLists.txt
trunk/blender/source/blender/blenfont/SConscript
trunk/blender/source/blender/blenfont/intern/blf.c
trunk/blender/source/blender/blenfont/intern/blf_font.c
trunk/blender/source/blender/blenfont/intern/blf_internal_types.h
trunk/blender/source/blender/blenkernel/BKE_blender.h
trunk/blender/source/blender/blenkernel/BKE_colortools.h
trunk/blender/source/blender/blenkernel/BKE_image.h
trunk/blender/source/blender/blenkernel/BKE_node.h
trunk/blender/source/blender/blenkernel/BKE_scene.h
trunk/blender/source/blender/blenkernel/BKE_sequencer.h
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/blenkernel/intern/colortools.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/image_gen.c
trunk/blender/source/blender/blenkernel/intern/movieclip.c
trunk/blender/source/blender/blenkernel/intern/ocean.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/seqmodifier.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/tracking.c
trunk/blender/source/blender/blenlib/BLI_threads.h
trunk/blender/source/blender/blenlib/intern/threads.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/collada/ImageExporter.cpp
trunk/blender/source/blender/compositor/COM_compositor.h
trunk/blender/source/blender/compositor/intern/COM_CompositorContext.cpp
trunk/blender/source/blender/compositor/intern/COM_CompositorContext.h
trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.cpp
trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.h
trunk/blender/source/blender/compositor/intern/COM_Node.cpp
trunk/blender/source/blender/compositor/intern/COM_Node.h
trunk/blender/source/blender/compositor/intern/COM_compositor.cpp
trunk/blender/source/blender/compositor/nodes/COM_BlurNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_BokehImageNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_CompositorNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_DespeckleNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_FilterNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_ImageNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_MixNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_MovieClipNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_OutputFileNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_RenderLayersNode.h
trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_TextureNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_ViewerNode.cpp
trunk/blender/source/blender/compositor/operations/COM_ImageOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_OutputFileOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_OutputFileOperation.h
trunk/blender/source/blender/compositor/operations/COM_PreviewOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_PreviewOperation.h
trunk/blender/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ViewerBaseOperation.h
trunk/blender/source/blender/compositor/operations/COM_ViewerOperation.cpp
trunk/blender/source/blender/editors/include/ED_clip.h
trunk/blender/source/blender/editors/include/ED_image.h
trunk/blender/source/blender/editors/include/ED_view3d.h
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/interface/interface_ops.c
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/editors/object/object_bake.c
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/editors/render/render_opengl.c
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/editors/screen/screendump.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_clip/clip_buttons.c
trunk/blender/source/blender/editors/space_clip/clip_draw.c
trunk/blender/source/blender/editors/space_clip/clip_editor.c
trunk/blender/source/blender/editors/space_file/filelist.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_image/image_draw.c
trunk/blender/source/blender/editors/space_image/image_intern.h
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_draw.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_node/node_intern.h
trunk/blender/source/blender/editors/space_node/node_view.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_scopes.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_view.c
trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c
trunk/blender/source/blender/editors/space_view3d/drawmesh.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
trunk/blender/source/blender/imbuf/CMakeLists.txt
trunk/blender/source/blender/imbuf/IMB_imbuf.h
trunk/blender/source/blender/imbuf/IMB_imbuf_types.h
trunk/blender/source/blender/imbuf/SConscript
trunk/blender/source/blender/imbuf/intern/IMB_anim.h
trunk/blender/source/blender/imbuf/intern/IMB_filetype.h
trunk/blender/source/blender/imbuf/intern/allocimbuf.c
trunk/blender/source/blender/imbuf/intern/anim_movie.c
trunk/blender/source/blender/imbuf/intern/bmp.c
trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c
trunk/blender/source/blender/imbuf/intern/dds/dds_api.cpp
trunk/blender/source/blender/imbuf/intern/dds/dds_api.h
trunk/blender/source/blender/imbuf/intern/divers.c
trunk/blender/source/blender/imbuf/intern/filetype.c
trunk/blender/source/blender/imbuf/intern/indexer.c
trunk/blender/source/blender/imbuf/intern/iris.c
trunk/blender/source/blender/imbuf/intern/jp2.c
trunk/blender/source/blender/imbuf/intern/jpeg.c
trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.h
trunk/blender/source/blender/imbuf/intern/png.c
trunk/blender/source/blender/imbuf/intern/radiance_hdr.c
trunk/blender/source/blender/imbuf/intern/readimage.c
trunk/blender/source/blender/imbuf/intern/rectop.c
trunk/blender/source/blender/imbuf/intern/targa.c
trunk/blender/source/blender/imbuf/intern/thumbs.c
trunk/blender/source/blender/imbuf/intern/tiff.c
trunk/blender/source/blender/imbuf/intern/writeimage.c
trunk/blender/source/blender/makesdna/DNA_color_types.h
trunk/blender/source/blender/makesdna/DNA_image_types.h
trunk/blender/source/blender/makesdna/DNA_movieclip_types.h
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/makesdna/DNA_sequence_types.h
trunk/blender/source/blender/makesdna/DNA_space_types.h
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/makesrna/intern/rna_color.c
trunk/blender/source/blender/makesrna/intern/rna_image.c
trunk/blender/source/blender/makesrna/intern/rna_image_api.c
trunk/blender/source/blender/makesrna/intern/rna_movieclip.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
trunk/blender/source/blender/nodes/composite/node_composite_tree.c
trunk/blender/source/blender/nodes/composite/node_composite_util.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c
trunk/blender/source/blender/quicktime/apple/qtkit_import.m
trunk/blender/source/blender/quicktime/apple/quicktime_import.c
trunk/blender/source/blender/render/intern/include/render_result.h
trunk/blender/source/blender/render/intern/source/envmap.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/render_result.c
trunk/blender/source/blender/render/intern/source/render_texture.c
trunk/blender/source/blender/render/intern/source/rendercore.c
trunk/blender/source/blender/render/intern/source/shadeinput.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blender/windowmanager/intern/wm_playanim.c
trunk/blender/source/blenderplayer/CMakeLists.txt
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
trunk/blender/source/creator/CMakeLists.txt
Added Paths:
-----------
trunk/blender/source/blender/imbuf/IMB_colormanagement.h
trunk/blender/source/blender/imbuf/intern/IMB_colormanagement_intern.h
trunk/blender/source/blender/imbuf/intern/colormanagement.c
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_render.py 2012-09-15 10:03:17 UTC (rev 50627)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_render.py 2012-09-15 10:05:07 UTC (rev 50628)
@@ -316,10 +316,7 @@
col = split.column()
col.prop(rd, "use_raytrace", text="Ray Tracing")
- col.prop(rd, "use_color_management")
- sub = col.row()
- sub.active = rd.use_color_management == True
- sub.prop(rd, "use_color_unpremultiply")
+ col.prop(rd, "use_color_unpremultiply")
col.prop(rd, "alpha_mode", text="Alpha")
@@ -467,7 +464,7 @@
flow.prop(rd, "use_placeholder")
flow.prop(rd, "use_file_extension")
- layout.template_image_settings(image_settings)
+ layout.template_image_settings(image_settings, color_management=False)
if file_format == 'QUICKTIME_CARBON':
layout.operator("scene.render_data_set_quicktime_codec")
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_scene.py 2012-09-15 10:03:17 UTC (rev 50627)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_scene.py 2012-09-15 10:05:07 UTC (rev 50628)
@@ -231,6 +231,32 @@
col.prop(rd, "simplify_ao_sss", text="AO and SSS")
+class SCENE_PT_color_management(Panel):
+ bl_label = "Color Management"
+ bl_space_type = 'PROPERTIES'
+ bl_region_type = 'WINDOW'
+ bl_context = "scene"
+
+ def draw(self, context):
+ layout = self.layout
+
+ scene = context.scene
+
+ col = layout.column()
+ col.label(text="Display:")
+ col.prop(scene.display_settings, "display_device")
+
+ col = layout.column()
+ col.separator()
+ col.label(text="Render:")
+ col.template_colormanaged_view_settings(scene, "view_settings")
+
+ col = layout.column()
+ col.separator()
+ col.label(text="Sequencer:")
+ col.prop(scene.sequencer_colorspace_settings, "name")
+
+
class SCENE_PT_custom_props(SceneButtonsPanel, PropertyPanel, Panel):
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
_context_path = "scene"
Modified: trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py 2012-09-15 10:03:17 UTC (rev 50627)
+++ trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py 2012-09-15 10:05:07 UTC (rev 50628)
@@ -884,6 +884,8 @@
strip = act_strip(context)
sequencer = context.scene.sequence_editor
+ layout.prop(strip, "use_linear_modifiers")
+
layout.operator_menu_enum("sequencer.strip_modifier_add", "type")
for mod in strip.modifiers:
Modified: trunk/blender/source/blender/blenfont/BLF_api.h
===================================================================
--- trunk/blender/source/blender/blenfont/BLF_api.h 2012-09-15 10:03:17 UTC (rev 50627)
+++ trunk/blender/source/blender/blenfont/BLF_api.h 2012-09-15 10:05:07 UTC (rev 50628)
@@ -33,6 +33,7 @@
#define __BLF_API_H__
struct rctf;
+struct ColorManagedDisplay;
int BLF_init(int points, int dpi);
void BLF_exit(void);
@@ -151,7 +152,7 @@
*
* BLF_buffer(NULL, NULL, 0, 0, 0, FALSE);
*/
-void BLF_buffer(int fontid, float *fbuf, unsigned char *cbuf, int w, int h, int nch, int do_color_management);
+void BLF_buffer(int fontid, float *fbuf, unsigned char *cbuf, int w, int h, int nch, struct ColorManagedDisplay *display);
/* Set the color to be used for text. */
void BLF_buffer_col(int fontid, float r, float g, float b, float a);
Modified: trunk/blender/source/blender/blenfont/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenfont/CMakeLists.txt 2012-09-15 10:03:17 UTC (rev 50627)
+++ trunk/blender/source/blender/blenfont/CMakeLists.txt 2012-09-15 10:05:07 UTC (rev 50628)
@@ -27,6 +27,7 @@
../blenlib
../editors/include
../makesdna
+ ../imbuf
../../../intern/guardedalloc
)
Modified: trunk/blender/source/blender/blenfont/SConscript
===================================================================
--- trunk/blender/source/blender/blenfont/SConscript 2012-09-15 10:03:17 UTC (rev 50627)
+++ trunk/blender/source/blender/blenfont/SConscript 2012-09-15 10:05:07 UTC (rev 50628)
@@ -4,7 +4,7 @@
sources = env.Glob('intern/*.c')
-incs = '. intern #/intern/guardedalloc ../blenkernel ../blenlib ../makesdna ../editors/include'
+incs = '. intern #/intern/guardedalloc ../blenkernel ../blenlib ../makesdna ../imbuf ../editors/include'
incs += ' #/extern/glew/include'
incs += ' ' + env['BF_FREETYPE_INC']
incs += ' ' + env['BF_GETTEXT_INC']
Modified: trunk/blender/source/blender/blenfont/intern/blf.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf.c 2012-09-15 10:03:17 UTC (rev 50627)
+++ trunk/blender/source/blender/blenfont/intern/blf.c 2012-09-15 10:05:07 UTC (rev 50628)
@@ -50,7 +50,6 @@
#include "blf_internal_types.h"
#include "blf_internal.h"
-
/* Max number of font in memory.
* Take care that now every font have a glyph cache per size/dpi,
* so we don't need load the same font with different size, just
@@ -746,7 +745,7 @@
}
}
-void BLF_buffer(int fontid, float *fbuf, unsigned char *cbuf, int w, int h, int nch, int do_color_management)
+void BLF_buffer(int fontid, float *fbuf, unsigned char *cbuf, int w, int h, int nch, struct ColorManagedDisplay *display)
{
FontBLF *font = BLF_get(fontid);
@@ -756,7 +755,7 @@
font->buf_info.w = w;
font->buf_info.h = h;
font->buf_info.ch = nch;
- font->buf_info.do_color_management = do_color_management;
+ font->buf_info.display = display;
}
}
Modified: trunk/blender/source/blender/blenfont/intern/blf_font.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_font.c 2012-09-15 10:03:17 UTC (rev 50627)
+++ trunk/blender/source/blender/blenfont/intern/blf_font.c 2012-09-15 10:05:07 UTC (rev 50628)
@@ -53,6 +53,8 @@
#include "BIF_gl.h"
#include "BLF_api.h"
+#include "IMB_colormanagement.h"
+
#include "blf_internal_types.h"
#include "blf_internal.h"
@@ -245,11 +247,12 @@
blf_font_ensure_ascii_table(font);
/* another buffer specific call for color conversion */
- if (buf_info->do_color_management) {
- srgb_to_linearrgb_v4(b_col_float, buf_info->col);
+ if (buf_info->display) {
+ copy_v4_v4(b_col_float, buf_info->col);
+ IMB_colormanagement_display_to_scene_linear_v3(b_col_float, buf_info->display);
}
else {
- copy_v4_v4(b_col_float, buf_info->col);
+ srgb_to_linearrgb_v4(b_col_float, buf_info->col);
}
while (str[i]) {
Modified: trunk/blender/source/blender/blenfont/intern/blf_internal_types.h
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_internal_types.h 2012-09-15 10:03:17 UTC (rev 50627)
+++ trunk/blender/source/blender/blenfont/intern/blf_internal_types.h 2012-09-15 10:05:07 UTC (rev 50628)
@@ -145,8 +145,8 @@
/* number of channels. */
int ch;
- /* is the float buffer linear */
- int do_color_management;
+ /* display device used for color management */
+ struct ColorManagedDisplay *display;
/* and the color, the alphas is get from the glyph!
* color is srgb space */
Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h 2012-09-15 10:03:17 UTC (rev 50627)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h 2012-09-15 10:05:07 UTC (rev 50628)
@@ -42,7 +42,7 @@
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 263
-#define BLENDER_SUBVERSION 18
+#define BLENDER_SUBVERSION 19
/* 262 was the last editmesh release but its has compatibility code for bmesh data,
* so set the minversion to 2.61 */
Modified: trunk/blender/source/blender/blenkernel/BKE_colortools.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_colortools.h 2012-09-15 10:03:17 UTC (rev 50627)
+++ trunk/blender/source/blender/blenkernel/BKE_colortools.h 2012-09-15 10:05:07 UTC (rev 50628)
@@ -31,6 +31,9 @@
* \ingroup bke
*/
+struct ColorManagedColorspaceSettings;
+struct ColorManagedDisplaySettings;
+struct ColorManagedViewSettings;
struct CurveMapping;
struct CurveMap;
struct CurveMapPoint;
@@ -89,9 +92,25 @@
void curvemapping_premultiply(struct CurveMapping *cumap, int restore);
-void BKE_histogram_update_sample_line(struct Histogram *hist, struct ImBuf *ibuf, const short use_color_management);
-void scopes_update(struct Scopes *scopes, struct ImBuf *ibuf, int use_color_management);
+void BKE_histogram_update_sample_line(struct Histogram *hist, struct ImBuf *ibuf,
+ const struct ColorManagedViewSettings *view_settings,
+ const struct ColorManagedDisplaySettings *display_settings);
+void scopes_update(struct Scopes *scopes, struct ImBuf *ibuf, const struct ColorManagedViewSettings *view_settings,
+ const struct ColorManagedDisplaySettings *display_settings);
void scopes_free(struct Scopes *scopes);
void scopes_new(struct Scopes *scopes);
+void BKE_color_managed_display_settings_init(struct ColorManagedDisplaySettings *settings);
+void BKE_color_managed_display_settings_copy(struct ColorManagedDisplaySettings *new_settings,
+ const struct ColorManagedDisplaySettings *settings);
+
+void BKE_color_managed_view_settings_init(struct ColorManagedViewSettings *settings);
+void BKE_color_managed_view_settings_copy(struct ColorManagedViewSettings *new_settings,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list