[Bf-blender-cvs] [d5478e20cc5] blender2.8: Eevee: Fix AO disappearing when updating Probe Grids.

[Clément Foucault]

Commit: d5478e20cc52641ea44fb3acfd6a58fc021978df
Author: Clément Foucault
Date:   Wed Sep 13 19:40:53 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBd5478e20cc52641ea44fb3acfd6a58fc021978df

Eevee: Fix AO disappearing when updating Probe Grids.

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

M	source/blender/draw/engines/eevee/eevee_lightprobes.c

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

diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index eee4a392c69..96db3164fe1 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -957,7 +957,7 @@ static void render_scene_to_probe(
 	EEVEE_StorageList *stl = vedata->stl;
 	EEVEE_LightProbesInfo *pinfo = sldata->probes;
 
-	float winmat[4][4], posmat[4][4], tmp_ao_dist, tmp_ao_samples;
+	float winmat[4][4], posmat[4][4], tmp_ao_dist, tmp_ao_samples, tmp_ao_settings;
 
 	unit_m4(posmat);
 
@@ -971,6 +971,7 @@ static void render_scene_to_probe(
 	/* Disable AO until we find a way to hide really bad discontinuities between cubefaces. */
 	tmp_ao_dist = stl->effects->ao_dist;
 	tmp_ao_samples = stl->effects->ao_samples;
+	tmp_ao_settings = stl->effects->ao_settings;
 	stl->effects->ao_settings = 0.0f; /* Disable AO */
 
 	/* 1 - Render to each cubeface individually.
@@ -1050,6 +1051,7 @@ static void render_scene_to_probe(
 	txl->maxzbuffer = tmp_maxz;
 	stl->effects->ao_dist = tmp_ao_dist;
 	stl->effects->ao_samples = tmp_ao_samples;
+	stl->effects->ao_settings = tmp_ao_settings;
 }
 
 static void render_scene_to_planar(