[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56792] trunk/blender/source/blender: bridge tool: fix for error in recent commit.

Campbell Barton ideasman42 at gmail.com
Tue May 14 12:56:20 CEST 2013


Revision: 56792
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56792
Author:   campbellbarton
Date:     2013-05-14 10:56:18 +0000 (Tue, 14 May 2013)
Log Message:
-----------
bridge tool: fix for error in recent commit. missed NULL check for example face.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_editmesh.h
    trunk/blender/source/blender/bmesh/bmesh_class.h
    trunk/blender/source/blender/bmesh/operators/bmo_bridge.c

Modified: trunk/blender/source/blender/blenkernel/BKE_editmesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_editmesh.h	2013-05-14 10:42:30 UTC (rev 56791)
+++ trunk/blender/source/blender/blenkernel/BKE_editmesh.h	2013-05-14 10:56:18 UTC (rev 56792)
@@ -81,9 +81,6 @@
 	/* Object this editmesh came from (if it came from one) */
 	struct Object *ob;
 
-	/* Unused for now, we could bring it back and assign in the same way 'ob' is */
-	// struct Mesh *me;
-
 	/*temp variables for x-mirror editing*/
 	int mirror_cdlayer; /* -1 is invalid */
 } BMEditMesh;

Modified: trunk/blender/source/blender/bmesh/bmesh_class.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_class.h	2013-05-14 10:42:30 UTC (rev 56791)
+++ trunk/blender/source/blender/bmesh/bmesh_class.h	2013-05-14 10:56:18 UTC (rev 56792)
@@ -39,7 +39,6 @@
 struct BMFace;
 
 struct BLI_mempool;
-struct Object;
 
 /* note: it is very important for BMHeader to start with two
  * pointers. this is a requirement of mempool's method of

Modified: trunk/blender/source/blender/bmesh/operators/bmo_bridge.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_bridge.c	2013-05-14 10:42:30 UTC (rev 56791)
+++ trunk/blender/source/blender/bmesh/operators/bmo_bridge.c	2013-05-14 10:56:18 UTC (rev 56792)
@@ -303,7 +303,7 @@
 				}
 			}
 
-			if (f_example != f) {
+			if (f_example && (f_example != f)) {
 				BM_elem_attrs_copy(bm, bm, f_example, f);
 			}
 			BMO_elem_flag_enable(bm, f, FACE_OUT);




More information about the Bf-blender-cvs mailing list