[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42217] branches/bmesh/blender/source/ blender/bmesh/operators/removedoubles.c: fix for missing NULL check in remove doubles.

[Campbell Barton]

Revision: 42217
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42217
Author:   campbellbarton
Date:     2011-11-28 15:31:34 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
fix for missing NULL check in remove doubles.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c

Modified: branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c	2011-11-28 14:55:35 UTC (rev 42216)
+++ branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c	2011-11-28 15:31:34 UTC (rev 42217)
@@ -185,7 +185,7 @@
 			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;