Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T51314: crash cancelling Cycles bake during scene sync and update.

Browse Source
This commit is contained in:
Brecht Van Lommel
2017-05-13 07:09:22 +02:00
parent 8ca9fa5fd3
commit 890d871bc3
1 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
intern/cycles/blender/blender_session.cpp
View File

@@ -565,8 +565,6 @@ void BlenderSession::bake(BL::Object& b_object,
float result[]) float result[])
{ {
ShaderEvalType shader_type = get_shader_type(pass_type); ShaderEvalType shader_type = get_shader_type(pass_type);
size_t object_index = OBJECT_NONE;
int tri_offset = 0;
/* Set baking flag in advance, so kernel loading can check if we need /* Set baking flag in advance, so kernel loading can check if we need
* any baking capabilities. * any baking capabilities.
@@ -576,9 +574,6 @@ void BlenderSession::bake(BL::Object& b_object,
/* ensure kernels are loaded before we do any scene updates */ /* ensure kernels are loaded before we do any scene updates */
session->load_kernels(); session->load_kernels();
if(session->progress.get_cancel())
return;
if(shader_type == SHADER_EVAL_UV) { if(shader_type == SHADER_EVAL_UV) {
/* force UV to be available */ /* force UV to be available */
Pass::add(PASS_UV, scene->film->passes); Pass::add(PASS_UV, scene->film->passes);
@@ -596,50 +591,61 @@ void BlenderSession::bake(BL::Object& b_object,
scene->film->tag_update(scene); scene->film->tag_update(scene);
scene->integrator->tag_update(scene); scene->integrator->tag_update(scene);
/* update scene */ if(!session->progress.get_cancel()) {
BL::Object b_camera_override(b_engine.camera_override()); /* update scene */
sync->sync_camera(b_render, b_camera_override, width, height, ""); BL::Object b_camera_override(b_engine.camera_override());
sync->sync_data(b_render, sync->sync_camera(b_render, b_camera_override, width, height, "");
b_v3d, sync->sync_data(b_render,
b_camera_override, b_v3d,
width, height, b_camera_override,
&python_thread_state, width, height,
b_rlay_name.c_str()); &python_thread_state,
b_rlay_name.c_str());
/* get buffer parameters */
SessionParams session_params = BlenderSync::get_session_params(b_engine, b_userpref, b_scene, background);
BufferParams buffer_params = BlenderSync::get_buffer_params(b_render, b_v3d, b_rv3d, scene->camera, width, height);
scene->bake_manager->set_shader_limit((size_t)b_engine.tile_x(), (size_t)b_engine.tile_y());
/* set number of samples */
session->tile_manager.set_samples(session_params.samples);
session->reset(buffer_params, session_params.samples);
session->update_scene();
/* find object index. todo: is arbitrary - copied from mesh_displace.cpp */
for(size_t i = 0; i < scene->objects.size(); i++) {
if(strcmp(scene->objects[i]->name.c_str(), b_object.name().c_str()) == 0) {
object_index = i;
tri_offset = scene->objects[i]->mesh->tri_offset;
break;
}
} }
int object = object_index; BakeData *bake_data = NULL;
BakeData *bake_data = scene->bake_manager->init(object, tri_offset, num_pixels); if(!session->progress.get_cancel()) {
/* get buffer parameters */
SessionParams session_params = BlenderSync::get_session_params(b_engine, b_userpref, b_scene, background);
BufferParams buffer_params = BlenderSync::get_buffer_params(b_render, b_v3d, b_rv3d, scene->camera, width, height);
populate_bake_data(bake_data, object_id, pixel_array, num_pixels); scene->bake_manager->set_shader_limit((size_t)b_engine.tile_x(), (size_t)b_engine.tile_y());
/* set number of samples */ /* set number of samples */
session->tile_manager.set_samples(session_params.samples); session->tile_manager.set_samples(session_params.samples);
session->reset(buffer_params, session_params.samples); session->reset(buffer_params, session_params.samples);
session->update_scene(); session->update_scene();
session->progress.set_update_callback(function_bind(&BlenderSession::update_bake_progress, this)); /* find object index. todo: is arbitrary - copied from mesh_displace.cpp */
size_t object_index = OBJECT_NONE;
int tri_offset = 0;
scene->bake_manager->bake(scene->device, &scene->dscene, scene, session->progress, shader_type, bake_pass_filter, bake_data, result); for(size_t i = 0; i < scene->objects.size(); i++) {
if(strcmp(scene->objects[i]->name.c_str(), b_object.name().c_str()) == 0) {
object_index = i;
tri_offset = scene->objects[i]->mesh->tri_offset;
break;
}
}
int object = object_index;
bake_data = scene->bake_manager->init(object, tri_offset, num_pixels);
populate_bake_data(bake_data, object_id, pixel_array, num_pixels);
/* set number of samples */
session->tile_manager.set_samples(session_params.samples);
session->reset(buffer_params, session_params.samples);
session->update_scene();
session->progress.set_update_callback(function_bind(&BlenderSession::update_bake_progress, this));
}
/* Perform bake. Check cancel to avoid crash with incomplete scene data. */
if(!session->progress.get_cancel()) {
scene->bake_manager->bake(scene->device, &scene->dscene, scene, session->progress, shader_type, bake_pass_filter, bake_data, result);
}
/* free all memory used (host and device), so we wouldn't leave render /* free all memory used (host and device), so we wouldn't leave render
* engine with extra memory allocated * engine with extra memory allocated