Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYiming Wu <xp8110@outlook.com>2022-06-03 10:33:06 +0300
committerYiming Wu <xp8110@outlook.com>2022-06-03 10:36:27 +0300
commit9babe39de92ea9c5bd16f2ae2f5e5895271799c9 (patch)
treeaa9a0718e7780ce9073c8e5db0abe298b7c7de1e /source/blender/gpencil_modifiers
parentcf5529af12e581ff1331f61a37a5dfef00f45ee0 (diff)
LineArt: Include minor fixes in branch that's missing in master.
Diffstat (limited to 'source/blender/gpencil_modifiers')
-rw-r--r--source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c2
1 files changed, 2 insertions, 0 deletions
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);
}