fix for missing NULL check in remove doubles.
authorCampbell Barton <ideasman42@gmail.com>
Mon, 28 Nov 2011 15:31:34 +0000 (15:31 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 28 Nov 2011 15:31:34 +0000 (15:31 +0000)
source/blender/bmesh/operators/removedoubles.c

index 14d74a61e4c5d9b97f6c0b57d4ae39ccbf12058b..6c4aa7b74ac24822a6d5552633604ffab27febe0 100644 (file)
@@ -185,7 +185,7 @@ void bmesh_weldverts_exec(BMesh *bm, BMOperator *op)
                        v2 = BMO_Get_MapPointer(bm, op, "targetmap", v2);
                
                f2 = BM_Make_Ngon(bm, v, v2, edges, a, 1);
-               if (f2 != f) {
+               if (f2 && (f2 != f)) {
                        BM_Copy_Attributes(bm, bm, f, f2);
 
                        a = 0;