From b927d196969bd0bb28ba300a31df3d294443df26 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 5 Dec 2018 12:06:48 +0100 Subject: Color management: Query default view from display Solves weird situation when default display name is queried from OCIO, but Default view being assumed to be set for it. Now view is initialized to a default view of that display. --- source/blender/imbuf/IMB_colormanagement.h | 2 ++ source/blender/imbuf/intern/colormanagement.c | 6 ++++++ 2 files changed, 8 insertions(+) (limited to 'source/blender/imbuf') diff --git a/source/blender/imbuf/IMB_colormanagement.h b/source/blender/imbuf/IMB_colormanagement.h index a08a8c976e0..1a224639366 100644 --- a/source/blender/imbuf/IMB_colormanagement.h +++ b/source/blender/imbuf/IMB_colormanagement.h @@ -143,6 +143,8 @@ const char *IMB_colormanagement_display_get_indexed_name(int index); const char *IMB_colormanagement_display_get_default_name(void); struct ColorManagedDisplay *IMB_colormanagement_display_get_named(const char *name); const char *IMB_colormanagement_display_get_none_name(void); +const char *IMB_colormanagement_display_get_default_view_transform_name( + struct ColorManagedDisplay *display); /* ** View functions ** */ int IMB_colormanagement_view_get_named_index(const char *name); diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index 6f8932f0e9c..afba1c6a41a 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -2363,6 +2363,12 @@ const char *IMB_colormanagement_display_get_none_name(void) return colormanage_display_get_default_name(); } +const char *IMB_colormanagement_display_get_default_view_transform_name( + struct ColorManagedDisplay *display) +{ + return colormanage_view_get_default_name(display); +} + /*********************** View functions *************************/ const char *colormanage_view_get_default_name(const ColorManagedDisplay *display) -- cgit v1.2.3