[Bf-blender-cvs] [24fbb449c62] temp-lineart-contained: Lineart: Fixed uninitialized variables.
YimingWu
noreply at git.blender.org
Fri Feb 19 03:50:34 CET 2021
Commit: 24fbb449c623ead03b3007434af85c6b2958e593
Author: YimingWu
Date: Fri Feb 19 10:49:44 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB24fbb449c623ead03b3007434af85c6b2958e593
Lineart: Fixed uninitialized variables.
===================================================================
M release/datafiles/locale
M release/scripts/addons
M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
M source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
M source/tools
===================================================================
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 6c693b5b0b2..8a05b618f03 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 6c693b5b0b27468d4fd2d2c47ea023eebbb0dbc0
+Subproject commit 8a05b618f031582c006c6f62b9e60619ab3eef8b
diff --git a/release/scripts/addons b/release/scripts/addons
index 35d5df9bf44..67f1fbca148 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 35d5df9bf443b7f03857cffc45a1ba4f7e03de94
+Subproject commit 67f1fbca1482d9d9362a4001332e785c3fd5d230
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index 8d36308327b..f1a8d7ca3db 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -479,7 +479,7 @@ int ED_lineart_point_inside_triangle(const double v[2],
static int lineart_point_on_segment(double v[2], double v0[2], double v1[2])
{
- double c1, c2;
+ double c1 = 1, c2 = 0; /* c1!=c2 by default. */
double l0[2], l1[2];
sub_v2_v2v2_db(l0, v, v0);
@@ -505,8 +505,6 @@ static int lineart_point_on_segment(double v[2], double v0[2], double v1[2])
return (c1 >= 0 && c1 <= 1);
}
- // XXX FIXME seems like there is a chance that c1 and c2 is used uninitalized here.
-
if (LRT_DOUBLE_CLOSE_ENOUGH(c1, c2) && c1 >= 0 && c1 <= 1) {
return 1;
}
@@ -704,11 +702,8 @@ static void lineart_triangle_cull_single(LineartRenderBuffer *rb,
rb->triangle_size * (t_count + 1));
new_rl = &((LineartRenderLine *)leln->pointer)[l_count];
-
- // XXX FIXME
- // Seems like the logic here is faulty.
- // rl is not assinged so rl->l_obindex seems like it will read random values the first time
- // around. l_obi and r_obi doesn't seem like they are initialized either...
+ /* Init rl to the last rl entry. */
+ rl = new_rl;
#define INCREASE_RL \
l_count++; \
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
index d9e6551a288..ce3e02dd30c 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
@@ -264,6 +264,7 @@ static int lineart_gpencil_clear_all_strokes_invoke(bContext *C,
const wmEvent *UNUSED(event))
{
// FIXME ASAN reports a mem leak here in CTX_DATA_BEGIN
+ // Yiming: I'm not sure why here it leaks... I'm taling a look.
CTX_DATA_BEGIN (C, Object *, ob, visible_objects) {
if (ob->type != OB_GPENCIL) {
return OPERATOR_CANCELLED;
diff --git a/source/tools b/source/tools
index 3f8b3cfa3d1..5cf2fc3e5dc 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 3f8b3cfa3d17de7f9b02b0755138e64745c6f7e8
+Subproject commit 5cf2fc3e5dc28025394b57d8743401295528f310
More information about the Bf-blender-cvs
mailing list