blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

LineArt: Use thread safe bound box. 

The old method is not thread safe, which will lead to minor
memory leaks. This patch fixed that.

Reviewed By: Sebastian Parborg (zeddb)

Differential Revision: https://developer.blender.org/D14904
This commit is contained in:
YimingWu 2022-05-10 14:41:35 +08:00
parent c60b570841
commit cd349dc402
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
View File

@ -2358,18 +2358,21 @@ static void lineart_geometry_load_assign_thread(LineartObjectLoadTaskInfo *olti_
static bool lineart_geometry_check_visible(double (*model_view_proj)[4],
double shift_x,
double shift_y,
Object *use_ob)
Mesh *use_mesh)
{
const BoundBox *bb = BKE_object_boundbox_get(use_ob);
if (!bb) {
/* For lights and empty stuff there will be no bbox. */
if (!use_mesh) {
return false;
}
float mesh_min[3], mesh_max[3];
INIT_MINMAX(mesh_min, mesh_max);
BKE_mesh_minmax(use_mesh, mesh_min, mesh_max);
BoundBox bb = {0};
BKE_boundbox_init_from_minmax(&bb, mesh_min, mesh_max);
double co[8][4];
double tmp[3];
for (int i = 0; i < 8; i++) {
copy_v3db_v3fl(co[i], bb->vec[i]);
copy_v3db_v3fl(co[i], bb.vec[i]);
copy_v3_v3_db(tmp, co[i]);
mul_v4_m4v3_db(co[i], model_view_proj, tmp);
co[i][0] -= shift_x * 2 * co[i][3];
@ -2481,13 +2484,6 @@ static void lineart_main_load_geometries(
continue;
}
if (!lineart_geometry_check_visible(obi->model_view_proj, rb->shift_x, rb->shift_y, use_ob)) {
if (G.debug_value == 4000) {
bound_box_discard_count++;
}
continue;
}
if (use_ob->type == OB_MESH) {
use_mesh = BKE_object_get_evaluated_mesh(use_ob);
}
@ -2506,6 +2502,17 @@ static void lineart_main_load_geometries(
continue;
}
if (!lineart_geometry_check_visible(
obi->model_view_proj, rb->shift_x, rb->shift_y, use_mesh)) {
if (ob->type != OB_MESH) {
BKE_id_free(NULL, use_mesh);
}
if (G.debug_value == 4000) {
bound_box_discard_count++;
}
continue;
}
if (ob->type != OB_MESH) {
obi->free_use_mesh = true;
}