[Bf-blender-cvs] [97656f68e16] lanpr-under-gp: LineArt: Fixed render vert linking in intersection stage.
YimingWu
noreply at git.blender.org
Fri Oct 2 09:08:35 CEST 2020
Commit: 97656f68e164e2cb6062fca1f7e3b350c4719799
Author: YimingWu
Date: Fri Oct 2 15:05:21 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB97656f68e164e2cb6062fca1f7e3b350c4719799
LineArt: Fixed render vert linking in intersection stage.
===================================================================
M source/blender/editors/lineart/lineart_cpu.c
===================================================================
diff --git a/source/blender/editors/lineart/lineart_cpu.c b/source/blender/editors/lineart/lineart_cpu.c
index c3127352567..81c402a476d 100644
--- a/source/blender/editors/lineart/lineart_cpu.c
+++ b/source/blender/editors/lineart/lineart_cpu.c
@@ -2153,7 +2153,8 @@ static LineartRenderVert *lineart_triangle_line_intersection_test(LineartRenderB
double gloc[3];
LineartRenderVert *l = rl->l, *r = rl->r;
- LISTBASE_FOREACH (LineartRenderVert *, rv, &testing->intersecting_verts) {
+ LISTBASE_FOREACH (LinkData *, ld, &testing->intersecting_verts) {
+ LineartRenderVert *rv = (LineartRenderVert *)ld->data;
if (rv->intersecting_with == rt && rv->intersecting_line == rl) {
return rv;
}
@@ -2198,7 +2199,7 @@ static LineartRenderVert *lineart_triangle_line_intersection_test(LineartRenderB
copy_v3_v3_db(result->gloc, gloc);
- BLI_addtail(&testing->intersecting_verts, result);
+ lineart_list_append_pointer_static(&testing->intersecting_verts, &rb->render_data_pool, result);
return result;
}
@@ -2242,10 +2243,12 @@ static LineartRenderLine *lineart_triangle_generate_intersection_line_only(
if (r == NULL) {
return 0;
}
- BLI_addtail(&testing->intersecting_verts, new_share);
+ lineart_list_append_pointer_static(
+ &testing->intersecting_verts, &rb->render_data_pool, new_share);
}
else {
- BLI_addtail(&rt->intersecting_verts, new_share);
+ lineart_list_append_pointer_static(
+ &rt->intersecting_verts, &rb->render_data_pool, new_share);
}
}
else {
More information about the Bf-blender-cvs
mailing list