diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-08-24 12:31:06 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-08-24 12:31:06 +0300 |
| commit | 6b1b2ded77f17b2a688f8a3168585864c05260c8 (patch) | |
| tree | 728cb4616c2b96bdc4eb70073433d9f823071c7d /source/blender/draw/engines/eevee/eevee_temporal_sampling.c | |
| parent | e4932d1167f486e59d38a9d599e473e4888872ec (diff) | |
| parent | 35ef42d967c7c127dea8bcd6b8173e722f3a853c (diff) | |
Merge branch 'blender-v2.90-release' into master
# Conflicts:
# source/blender/editors/space_node/node_draw.c
# source/blender/editors/space_sequencer/sequencer_draw.c
Diffstat (limited to 'source/blender/draw/engines/eevee/eevee_temporal_sampling.c')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_temporal_sampling.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c index 5976a9505e8..4f2cfe224c2 100644 --- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c +++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c @@ -247,8 +247,11 @@ int EEVEE_temporal_sampling_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data effects->taa_total_sample = first_sample_only ? 1 : scene_eval->eevee.taa_samples; MAX2(effects->taa_total_sample, 0); - DRW_view_persmat_get(NULL, persmat, false); - view_is_valid = view_is_valid && compare_m4m4(persmat, effects->prev_drw_persmat, FLT_MIN); + /* Motion blur steps could reset the sampling when camera is animated (see T79970). */ + if (!DRW_state_is_scene_render()) { + DRW_view_persmat_get(NULL, persmat, false); + view_is_valid = view_is_valid && compare_m4m4(persmat, effects->prev_drw_persmat, FLT_MIN); + } /* Prevent ghosting from probe data. */ view_is_valid = view_is_valid && (effects->prev_drw_support == DRW_state_draw_support()) && |