[Bf-blender-cvs] [9babe39de92] master: LineArt: Include minor fixes in branch that's missing in master.
Yiming Wu
noreply at git.blender.org
Fri Jun 3 09:37:23 CEST 2022
Commit: 9babe39de92ea9c5bd16f2ae2f5e5895271799c9
Author: Yiming Wu
Date: Fri Jun 3 15:33:06 2022 +0800
Branches: master
https://developer.blender.org/rB9babe39de92ea9c5bd16f2ae2f5e5895271799c9
LineArt: Include minor fixes in branch that's missing in master.
===================================================================
M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
===================================================================
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index e5e3eb850bf..621531d29e3 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -720,6 +720,7 @@ static void lineart_triangle_post(LineartTriangle *tri, LineartTriangle *orig)
/* Just re-assign normal and set cull flag. */
copy_v3_v3_db(tri->gn, orig->gn);
tri->flags = LRT_CULL_GENERATED;
+ tri->intersection_mask = orig->intersection_mask;
tri->material_mask_bits = orig->material_mask_bits;
tri->mat_occlusion = orig->mat_occlusion;
}
@@ -3989,6 +3990,7 @@ static void lineart_bounding_area_link_triangle(LineartRenderBuffer *rb,
static void lineart_free_bounding_area_memory(LineartBoundingArea *ba, bool recursive)
{
+ BLI_spin_end(&ba->lock);
if (ba->linked_lines) {
MEM_freeN(ba->linked_lines);
}
More information about the Bf-blender-cvs
mailing list