[Bf-blender-cvs] [4c336f034e3] blender2.8: Draw manager: Use render view transform as default

Sergey Sharybin noreply at git.blender.org
Thu Dec 6 12:34:00 CET 2018


Commit: 4c336f034e35ad9661e3ceb4da50c673a2e6690b
Author: Sergey Sharybin
Date:   Thu Dec 6 12:30:35 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB4c336f034e35ad9661e3ceb4da50c673a2e6690b

Draw manager: Use render view transform as default

===================================================================

M	source/blender/blenkernel/intern/colortools.c
M	source/blender/draw/intern/draw_manager.c

===================================================================

diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index 554a5a63b1a..60a7653cd1a 100644
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -1584,8 +1584,10 @@ void BKE_color_managed_view_settings_init_render(
 	 * default configuration. */
 	BLI_strncpy(view_settings->look, "None", sizeof(view_settings->look));
 
+	view_settings->flag = 0;
 	view_settings->gamma = 1.0f;
 	view_settings->exposure = 0.0f;
+	view_settings->curve_mapping = NULL;
 }
 
 void BKE_color_managed_view_settings_init_default(
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) {



More information about the Bf-blender-cvs mailing list