diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-26 17:17:47 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-26 17:17:47 +0400 |
| commit | fae7dd22c77bae06af4082aaac205a9a3e46014c (patch) | |
| tree | e1c0549a5c1d524d6efa3382a9e8e14d86afd4b6 /source/blender/blenkernel/intern | |
| parent | 36966ccfebeb3c91cf17a9cb4dba91d4390f6890 (diff) | |
Color Management: resolve warnings when OCIO configuration file misses None display
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 758e348c073..3a28a4b2455 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -1266,9 +1266,11 @@ void BKE_scene_disable_color_management(Scene *scene) ColorManagedDisplaySettings *display_settings = &scene->display_settings; ColorManagedViewSettings *view_settings = &scene->view_settings; const char *view; + const char *none_display_name; - /* NOTE: None display with Default view should always exist in OCIO configuration, otherwise it wouldn't work as expected */ - BLI_strncpy(display_settings->display_device, "None", sizeof(display_settings->display_device)); + none_display_name = IMB_colormanagement_display_get_none_name(); + + BLI_strncpy(display_settings->display_device, none_display_name, sizeof(display_settings->display_device)); view = IMB_colormanagement_view_get_default_name(display_settings->display_device); |