Crash fix; rendering AO with envmap on didn't work.

Note that envmaps still render without raytracing.

1 files changed, 3 insertions, 0 deletions

diff --git a/source/blender/renderconverter/intern/convertBlenderScene.c b/source/blender/renderconverter/intern/convertBlenderScene.c
index 4f564e2b233..60d8745526e 100644
--- a/source/blender/renderconverter/intern/convertBlenderScene.c
+++ b/source/blender/renderconverter/intern/convertBlenderScene.c
@@ -2570,6 +2570,9 @@ void RE_rotateBlenderScene(void)
 		R.wrld.aosphere= MEM_mallocN(2*3*R.wrld.aosamp*R.wrld.aosamp*sizeof(float), "AO sphere");
 		/* we make twice the amount of samples, because only a hemisphere is used */
 		init_ao_sphere(R.wrld.aosphere, 2*R.wrld.aosamp*R.wrld.aosamp, 16);
+		
+		/* bah... init_render_world writes this over, and that is called/needed in envmap. */
+		G.scene->world->aosphere= R.wrld.aosphere;
 	}
 	init_render_textures();
 	init_render_materials();