Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2021-02-18 13:11:00 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2021-02-18 13:11:00 +0300
commitb166429fc9ba4f5478dad262077db001b1c75863 (patch)
treee0248e08f087f610839cab27274c6c8fc2cccf74 /source/blender/draw
parent72e2b5060dcc164b05a6d204824e6f94834ca100 (diff)
parent75580fa6a661eba58f9d39f8332985b1b72d3bc3 (diff)
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/draw')
-rw-r--r--source/blender/draw/engines/eevee/eevee_renderpasses.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_renderpasses.c b/source/blender/draw/engines/eevee/eevee_renderpasses.c
index 1ed0ecf5cd4..c759e426875 100644
--- a/source/blender/draw/engines/eevee/eevee_renderpasses.c
+++ b/source/blender/draw/engines/eevee/eevee_renderpasses.c
@@ -283,8 +283,9 @@ void EEVEE_renderpasses_postprocess(EEVEE_ViewLayerData *UNUSED(sldata),
EEVEE_EffectsInfo *effects = stl->effects;
/* Compensate for taa_current_sample being incremented after last drawing in
- * EEVEE_temporal_sampling_draw. */
- const int current_sample = effects->taa_current_sample - 1;
+ * EEVEE_temporal_sampling_draw when DRW_state_is_image_render(). */
+ const int current_sample = DRW_state_is_image_render() ? effects->taa_current_sample - 1 :
+ effects->taa_current_sample;
g_data->renderpass_current_sample = current_sample;
g_data->renderpass_type = renderpass_type;
g_data->renderpass_postprocess = PASS_POST_UNDEFINED;