[Bf-blender-cvs] [439fe65] master: Fix use of uninitialized variable introduced in fix for T48755.

Brecht Van Lommel noreply at git.blender.org
Mon Jul 4 18:25:08 CEST 2016


Commit: 439fe6568fc5494ef18394612da3eb069bb82483
Author: Brecht Van Lommel
Date:   Mon Jul 4 17:29:52 2016 +0200
Branches: master
https://developer.blender.org/rB439fe6568fc5494ef18394612da3eb069bb82483

Fix use of uninitialized variable introduced in fix for T48755.

===================================================================

M	source/blender/editors/uvedit/uvedit_parametrizer.c

===================================================================

diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c
index b3190ef..cd368ab 100644
--- a/source/blender/editors/uvedit/uvedit_parametrizer.c
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.c
@@ -2804,7 +2804,7 @@ static PBool p_chart_abf_solve(PChart *chart)
 
 static void p_chart_pin_positions(PChart *chart, PVert **pin1, PVert **pin2)
 {
-	if (pin1 == pin2) {
+	if (!*pin1 || !*pin2 || *pin1 == *pin2) {
 		/* degenerate case */
 		PFace *f = chart->faces;
 		*pin1 = f->edge->vert;
@@ -3051,7 +3051,7 @@ static void p_chart_lscm_begin(PChart *chart, PBool live, PBool abf)
 			p_chart_boundaries(chart, NULL, &outer);
 
 			/* outer can be NULL with non-finite coords. */
-			if (outer && !p_chart_symmetry_pins(chart, outer, &pin1, &pin2)) {
+			if (!(outer && p_chart_symmetry_pins(chart, outer, &pin1, &pin2))) {
 				p_chart_extrema_verts(chart, &pin1, &pin2);
 			}




More information about the Bf-blender-cvs mailing list