Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2007-09-11 04:26:15 +0400
committerMatt Ebb <matt@mke3.net>2007-09-11 04:26:15 +0400
commitc5ef3006b62df9c000d17f29781c970ac78dc92b (patch)
treefda8b0d55329d7dd3f3374f520df0f9ef10ccf81 /source/blender/render
parentf42ef22cc0f15e96d0286a205531856ad8ab9c3e (diff)
* AO bugfix - Constant QMC sampling wasn't getting initialised for bake rendering, causing a crash.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/convertblender.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 7d95a5e6340..cb31c58ab2f 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -3986,8 +3986,13 @@ void RE_Database_Baking(Render *re, Scene *scene, int type)
}
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);