[Bf-blender-cvs] [5200f6a2d7b] blender2.8: Fix crash in edbm_shortest_path_pick_ex

Dalai Felinto noreply at git.blender.org
Tue Aug 21 17:17:49 CEST 2018


Commit: 5200f6a2d7b56fa6d28c6f70d6c90642790d22c3
Author: Dalai Felinto
Date:   Tue Aug 21 12:13:53 2018 -0300
Branches: blender2.8
https://developer.blender.org/rB5200f6a2d7b56fa6d28c6f70d6c90642790d22c3

Fix crash in edbm_shortest_path_pick_ex

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

M	source/blender/editors/mesh/editmesh_path.c

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

diff --git a/source/blender/editors/mesh/editmesh_path.c b/source/blender/editors/mesh/editmesh_path.c
index 68157dab4e0..7bc12aa9ebf 100644
--- a/source/blender/editors/mesh/editmesh_path.c
+++ b/source/blender/editors/mesh/editmesh_path.c
@@ -563,7 +563,7 @@ static bool edbm_shortest_path_pick_ex(
         BMElem *ele_src, BMElem *ele_dst)
 {
 
-	if (ELEM(NULL, ele_src, ele_dst) && (ele_src->head.htype != ele_dst->head.htype)) {
+	if (ELEM(NULL, ele_src, ele_dst) || (ele_src->head.htype != ele_dst->head.htype)) {
 		/* pass */
 	}
 	else if (ele_src->head.htype == BM_VERT) {



More information about the Bf-blender-cvs mailing list