Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-12-06 13:56:23 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-12-06 14:31:50 +0300
commit005e6274ad9105b8e8b03ba527487bee391dc8a4 (patch)
tree5976a81adbf1690947ad5c6394869c6be1652fef /source/blender/blenkernel
parent0e5f97a3a1b3ad2bc49b2e553345bd191b2e06cf (diff)
Color management: Cleanup, make function name more clear
The idea is to reflect that the view settings are the best for cases when one wants to see things as if they are a render result.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/BKE_colortools.h5
-rw-r--r--source/blender/blenkernel/intern/colortools.c2
-rw-r--r--source/blender/blenkernel/intern/image.c4
-rw-r--r--source/blender/blenkernel/intern/scene.c4
4 files changed, 9 insertions, 6 deletions
diff --git a/source/blender/blenkernel/BKE_colortools.h b/source/blender/blenkernel/BKE_colortools.h
index 7c378bd3e06..d509bf5eb6c 100644
--- a/source/blender/blenkernel/BKE_colortools.h
+++ b/source/blender/blenkernel/BKE_colortools.h
@@ -101,9 +101,12 @@ void BKE_color_managed_display_settings_copy(
struct ColorManagedDisplaySettings *new_settings,
const struct ColorManagedDisplaySettings *settings);
-void BKE_color_managed_view_settings_init(
+/* Initialize view settings to be best suitable for render type of viewing.
+ * This will use default view transform from the OCIO configuration. */
+void BKE_color_managed_view_settings_init_render(
struct ColorManagedViewSettings *settings,
const struct ColorManagedDisplaySettings *display_settings);
+
void BKE_color_managed_view_settings_copy(
struct ColorManagedViewSettings *new_settings,
const struct ColorManagedViewSettings *settings);
diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index bd006c8b832..d86dddd4e39 100644
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -1569,7 +1569,7 @@ void BKE_color_managed_display_settings_copy(ColorManagedDisplaySettings *new_se
BLI_strncpy(new_settings->display_device, settings->display_device, sizeof(new_settings->display_device));
}
-void BKE_color_managed_view_settings_init(
+void BKE_color_managed_view_settings_init_render(
ColorManagedViewSettings *view_settings,
const ColorManagedDisplaySettings *display_settings)
{
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index fc8e992915e..e08ca35aca8 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -1402,8 +1402,8 @@ void BKE_imformat_defaults(ImageFormatData *im_format)
im_format->compress = 15;
BKE_color_managed_display_settings_init(&im_format->display_settings);
- BKE_color_managed_view_settings_init(&im_format->view_settings,
- &im_format->display_settings);
+ BKE_color_managed_view_settings_init_render(&im_format->view_settings,
+ &im_format->display_settings);
}
void BKE_imbuf_to_image_format(struct ImageFormatData *im_format, const ImBuf *imbuf)
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index e8aebb2dbaa..053ca38a57c 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -763,8 +763,8 @@ void BKE_scene_init(Scene *sce)
colorspace_name = IMB_colormanagement_role_colorspace_name_get(COLOR_ROLE_DEFAULT_SEQUENCER);
BKE_color_managed_display_settings_init(&sce->display_settings);
- BKE_color_managed_view_settings_init(&sce->view_settings,
- &sce->display_settings);
+ BKE_color_managed_view_settings_init_render(&sce->view_settings,
+ &sce->display_settings);
BLI_strncpy(sce->sequencer_colorspace_settings.name, colorspace_name,
sizeof(sce->sequencer_colorspace_settings.name));