diff options
Diffstat (limited to 'intern/cycles/render')
-rw-r--r-- | intern/cycles/render/bake.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/render/bake.h | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/intern/cycles/render/bake.cpp b/intern/cycles/render/bake.cpp index c68f6e1f08e..bc313a52491 100644 --- a/intern/cycles/render/bake.cpp +++ b/intern/cycles/render/bake.cpp @@ -155,6 +155,10 @@ bool BakeManager::bake(Device *device, DeviceScene *dscene, Scene *scene, Progre task.shader_w = d_output.size(); task.num_samples = is_aa_pass(shader_type)? scene->integrator->aa_samples: 1; task.get_cancel = function_bind(&Progress::get_cancel, &progress); + task.update_progress_sample = function_bind(&Progress::increment_sample_update, &progress); + + this->num_parts = device->get_split_task_count(task); + this->num_samples = task.num_samples; device->task_add(task); device->task_wait(); diff --git a/intern/cycles/render/bake.h b/intern/cycles/render/bake.h index f91ba589b8b..bf03a164f8e 100644 --- a/intern/cycles/render/bake.h +++ b/intern/cycles/render/bake.h @@ -70,6 +70,9 @@ public: bool need_update; + int num_samples; + int num_parts; + private: BakeData *m_bake_data; bool m_is_baking; |