From 460a9619754c4fea315b99d688becad6fcbef26c Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 18 Dec 2012 17:46:54 +0000 Subject: Multires baker: made octree aware of user-defined resolution in performance panel --- source/blender/editors/object/object_bake.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender/editors/object/object_bake.c') diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index 77d31a900d4..8b40379f88d 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -99,6 +99,7 @@ typedef struct { int number_of_rays; float bias; int raytrace_structure; + int octree_resolution; } MultiresBakeJob; static int multiresbake_check(bContext *C, wmOperator *op) @@ -317,6 +318,7 @@ static int multiresbake_image_exec_locked(bContext *C, wmOperator *op) bkr.bias = scene->r.bake_biasdist; bkr.number_of_rays = scene->r.bake_rays_number; bkr.raytrace_structure = scene->r.raytrace_structure; + bkr.octree_resolution = scene->r.ocres; /* create low-resolution DM (to bake to) and hi-resolution DM (to bake from) */ bkr.hires_dm = multiresbake_create_hiresdm(scene, ob, &bkr.tot_lvl, &bkr.simple); @@ -353,6 +355,7 @@ static void init_multiresbake_job(bContext *C, MultiresBakeJob *bkj) bkj->bias = scene->r.bake_biasdist; bkj->number_of_rays = scene->r.bake_rays_number; bkj->raytrace_structure = scene->r.raytrace_structure; + bkj->octree_resolution = scene->r.ocres; CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases) { @@ -418,6 +421,7 @@ static void multiresbake_startjob(void *bkv, short *stop, short *do_update, floa bkr.bias = bkj->bias; bkr.number_of_rays = bkj->number_of_rays; bkr.raytrace_structure = bkj->raytrace_structure; + bkr.octree_resolution = bkj->octree_resolution; RE_multires_bake_images(&bkr); -- cgit v1.2.3