[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12005] trunk/blender/source/blender/ render/intern/source/convertblender.c: * AO bugfix - Constant QMC sampling wasn' t getting initialised for bake rendering, causing a crash.

[Matt Ebb]

Revision: 12005
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12005
Author:   broken
Date:     2007-09-11 02:26:15 +0200 (Tue, 11 Sep 2007)

Log Message:
-----------
* AO bugfix - Constant QMC sampling wasn't getting initialised for bake rendering, causing a crash.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/convertblender.c

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c	2007-09-10 23:41:04 UTC (rev 12004)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2007-09-11 00:26:15 UTC (rev 12005)
@@ -3986,9 +3986,14 @@
 	}
 	
 	init_render_world(re);	/* do first, because of ambient. also requires re->osa set correct */
-	if(re->wrld.mode & WO_AMB_OCC)
-		init_ao_sphere(&re->wrld);
+	if(re->wrld.mode & WO_AMB_OCC) {
+		if (re->wrld.ao_samp_method == WO_AOSAMP_HAMMERSLEY)
+			init_render_hammersley(re);
+		else if (re->wrld.ao_samp_method == WO_AOSAMP_CONSTANT)
+			init_ao_sphere(&re->wrld);
+	}
 	
+	
 	/* still bad... doing all */
 	init_render_textures(re);
 	init_render_materials(re->r.mode, &re->wrld.ambr);