diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2021-01-27 20:44:59 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2021-01-27 20:44:59 +0300 |
commit | c604fd56a79eab8d1a5d50937b1ef1d0034dc2e1 (patch) | |
tree | d9756354eab29eef6fca889acc72f410c0f86bc1 /source/blender/editors | |
parent | 4c4ccdfa3663695950f409ed6a07c446b9f56093 (diff) | |
parent | 37e60289c2099148dddc7fdd7a8855c2c0a97328 (diff) |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/animation/anim_markers.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index a77864415ce..2ab809c3633 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -749,8 +749,8 @@ static bool ed_marker_move_use_time(MarkerMove *mm) ((mm->slink->spacetype == SPACE_ACTION) && (((SpaceAction *)mm->slink)->flag & SACTION_DRAWTIME)) || ((mm->slink->spacetype == SPACE_GRAPH) && - !(((SpaceGraph *)mm->slink)->flag & SIPO_DRAWTIME)) || - ((mm->slink->spacetype == SPACE_NLA) && !(((SpaceNla *)mm->slink)->flag & SNLA_DRAWTIME))) { + (((SpaceGraph *)mm->slink)->flag & SIPO_DRAWTIME)) || + ((mm->slink->spacetype == SPACE_NLA) && (((SpaceNla *)mm->slink)->flag & SNLA_DRAWTIME))) { return true; } diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index eee8549572f..af9f5937b4f 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -1959,6 +1959,16 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(Depsgraph *depsgraph, } } + /* XXX(jbakker): `do_color_management` should be controlled by the caller. Currently when doing a + * viewport render animation and saving to an 8bit file format, color management would be applied + * twice. Once here, and once when saving the saving to disk. In this case the Save As Render + * option cannot be controlled either. But when doing an offscreen render you want to do the + * color management here. + * + * This option was added here to increase the performance when rendering for a playblast. When + * using workbench the color differences haven't been reported as a bug. But users also use the + * viewport rendering to render Eevee scenes. In the later situation the saved colors + * are totally wrong. */ const bool do_color_management = (ibuf->rect_float == NULL); ED_view3d_draw_offscreen(depsgraph, scene, |