blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Draw manager: Use render view transform as default

This commit is contained in:
Sergey Sharybin 2018-12-06 12:30:35 +01:00
parent 7ed8e9167d
commit 4c336f034e
Notes: blender-bot 2023-02-14 08:35:51 +01:00 
Referenced by issue #58405, Inconsistent Color management behavior for textures between Solid and Eevee
Referenced by issue #56669, Weight Paint Mode doesn't worked with sub division modifier.
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/colortools.c
View File

@ -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(

16
source/blender/draw/intern/draw_manager.c
View File

@ -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) {