diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-08-05 09:48:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-08-05 09:48:03 +0300 |
| commit | 05fbbfec0b0a19f1f7abe97048faa9959e6efd05 (patch) | |
| tree | a3d013708ea8e1dbd7f70a9ecee9e42426db9980 /source/blender/draw/engines/eevee/eevee_engine.c | |
| parent | ef7b804e26b912603449387df69da0dbf66c1ec0 (diff) | |
| parent | 3a522f7a7ffd49ae51ccdd2b050eee6f15b98ac2 (diff) | |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/draw/engines/eevee/eevee_engine.c')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_engine.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c index 7bf4c78d870..05189e6cdc7 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.c +++ b/source/blender/draw/engines/eevee/eevee_engine.c @@ -461,6 +461,7 @@ static void eevee_render_to_image(void *vedata, } EEVEE_PrivateData *g_data = ved->stl->g_data; + int initial_frame = CFRA; int steps = max_ii(1, scene->eevee.motion_blur_steps); int time_steps_tot = (do_motion_blur) ? steps : 1; g_data->render_tot_samples = divide_ceil_u(scene->eevee.taa_render_samples, time_steps_tot); @@ -560,6 +561,11 @@ static void eevee_render_to_image(void *vedata, /* Restore original viewport size. */ DRW_render_viewport_size_set((int[2]){g_data->size_orig[0], g_data->size_orig[1]}); + + if (CFRA != initial_frame) { + /* Restore original frame number. This is because the render pipeline expects it. */ + RE_engine_frame_set(engine, initial_frame, 0.0f); + } } static void eevee_engine_free(void) |