Commit: 33347b4ed9b02ea8fe4c5c5795ae79b89eb64cf2
Author: Clément Foucault
Date:   Thu Feb 22 00:16:34 2018 +0100
Branches: temp-drawcontext
https://developer.blender.org/rB33347b4ed9b02ea8fe4c5c5795ae79b89eb64cf2

Eevee: Fix SSR not appearing in render.

===================================================================

M       source/blender/draw/engines/eevee/eevee_effects.c
M       source/blender/draw/engines/eevee/eevee_engine.c
M       source/blender/draw/engines/eevee/eevee_render.c

===================================================================

diff --git a/source/blender/draw/engines/eevee/eevee_effects.c 
b/source/blender/draw/engines/eevee/eevee_effects.c
index b54b04128c0..3427bb1d397 100644
--- a/source/blender/draw/engines/eevee/eevee_effects.c
+++ b/source/blender/draw/engines/eevee/eevee_effects.c
@@ -214,9 +214,6 @@ void EEVEE_effects_init(EEVEE_ViewLayerData *sldata, 
EEVEE_Data *vedata, Object
                DRW_TEXTURE_FREE_SAFE(txl->color_double_buffer);
                DRW_FRAMEBUFFER_FREE_SAFE(fbl->double_buffer);
        }
-
-       /* Copy previous persmat to UBO data */
-       copy_m4_m4(common_data->prev_persmat, stl->effects->prev_persmat);
 }
 
 void EEVEE_effects_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
diff --git a/source/blender/draw/engines/eevee/eevee_engine.c 
b/source/blender/draw/engines/eevee/eevee_engine.c
index 4a7258d6525..b2584c4e109 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.c
+++ b/source/blender/draw/engines/eevee/eevee_engine.c
@@ -197,6 +197,8 @@ static void eevee_draw_background(void *vedata)
                        EEVEE_volumes_set_jitter(sldata, 
stl->effects->taa_current_sample - 1);
                        EEVEE_materials_init(sldata, stl, fbl);
                }
+               /* Copy previous persmat to UBO data */
+               copy_m4_m4(sldata->common_data.prev_persmat, 
stl->effects->prev_persmat);
 
                /* Refresh Probes */
                DRW_stats_group_start("Probes Refresh");
diff --git a/source/blender/draw/engines/eevee/eevee_render.c 
b/source/blender/draw/engines/eevee/eevee_render.c
index f2db27f812f..77f46abe16c 100644
--- a/source/blender/draw/engines/eevee/eevee_render.c
+++ b/source/blender/draw/engines/eevee/eevee_render.c
@@ -417,6 +417,8 @@ void EEVEE_render_draw(EEVEE_Data *vedata, RenderEngine 
*engine, RenderResult *r
 
                /* Restore winmat before jittering again. */
                copy_m4_m4(stl->effects->overide_winmat, g_data->winmat);
+               /* Copy previous persmat to UBO data */
+               copy_m4_m4(sldata->common_data.prev_persmat, 
stl->effects->prev_persmat);
 
                BLI_halton_3D(primes, offset, stl->effects->taa_current_sample, 
r);
                EEVEE_update_noise(psl, fbl, r);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to