diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-05 14:06:48 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-05 16:11:21 +0300 |
| commit | b927d196969bd0bb28ba300a31df3d294443df26 (patch) | |
| tree | faed1387d01b29306181e1caabce872916898928 /source/blender/blenkernel/BKE_colortools.h | |
| parent | 9c7f01b9058409838f9087fdc57fadc1a4d505a1 (diff) | |
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.
Diffstat (limited to 'source/blender/blenkernel/BKE_colortools.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_colortools.h | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/source/blender/blenkernel/BKE_colortools.h b/source/blender/blenkernel/BKE_colortools.h index 5332b3acd72..7c378bd3e06 100644 --- a/source/blender/blenkernel/BKE_colortools.h +++ b/source/blender/blenkernel/BKE_colortools.h @@ -95,18 +95,26 @@ void scopes_update(struct Scopes *scopes, struct ImBuf *ibuf, con 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_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, - const struct ColorManagedViewSettings *settings); +void BKE_color_managed_view_settings_init( + struct ColorManagedViewSettings *settings, + const struct ColorManagedDisplaySettings *display_settings); +void BKE_color_managed_view_settings_copy( + struct ColorManagedViewSettings *new_settings, + const struct ColorManagedViewSettings *settings); void BKE_color_managed_view_settings_free(struct ColorManagedViewSettings *settings); -void BKE_color_managed_colorspace_settings_init(struct ColorManagedColorspaceSettings *colorspace_settings); -void BKE_color_managed_colorspace_settings_copy(struct ColorManagedColorspaceSettings *colorspace_settings, - const struct ColorManagedColorspaceSettings *settings); -bool BKE_color_managed_colorspace_settings_equals(const struct ColorManagedColorspaceSettings *settings1, - const struct ColorManagedColorspaceSettings *settings2); +void BKE_color_managed_colorspace_settings_init( + struct ColorManagedColorspaceSettings *colorspace_settings); +void BKE_color_managed_colorspace_settings_copy( + struct ColorManagedColorspaceSettings *colorspace_settings, + const struct ColorManagedColorspaceSettings *settings); +bool BKE_color_managed_colorspace_settings_equals( + const struct ColorManagedColorspaceSettings *settings1, + const struct ColorManagedColorspaceSettings *settings2); #endif |