diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-06 14:30:35 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-06 14:31:58 +0300 |
| commit | 4c336f034e35ad9661e3ceb4da50c673a2e6690b (patch) | |
| tree | f99f937e6e8d8153b14271ebf1316b267f0bed02 /source/blender/draw/intern | |
| parent | 7ed8e9167d725cc36b0c017c630e8b226fa65b3b (diff) | |
Draw manager: Use render view transform as default
Diffstat (limited to 'source/blender/draw/intern')
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index c744715ec6d..7e237d452b6 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -33,6 +33,7 @@ #include "BLF_api.h" +#include "BKE_colortools.h" #include "BKE_global.h" #include "BKE_mesh.h" #include "BKE_object.h" @@ -269,10 +270,19 @@ void DRW_transform_to_display(GPUTexture *tex, bool use_view_settings) if (!(DST.options.is_image_render && !DST.options.is_scene_render)) { Scene *scene = DST.draw_ctx.scene; ColorManagedDisplaySettings *display_settings = &scene->display_settings; - ColorManagedViewSettings *view_settings = (use_view_settings) ? &scene->view_settings : NULL; - + ColorManagedViewSettings *active_view_settings; + ColorManagedViewSettings default_view_settings; + if (use_view_settings) { + active_view_settings = &scene->view_settings; + } + else { + BKE_color_managed_view_settings_init_render( + &default_view_settings, + display_settings); + active_view_settings = &default_view_settings; + } use_ocio = IMB_colormanagement_setup_glsl_draw_from_space( - view_settings, display_settings, NULL, dither, false); + active_view_settings, display_settings, NULL, dither, false); } if (!use_ocio) { |