bridge tool: fix for error in recent commit. missed NULL check for example face.

3 files changed, 1 insertions, 5 deletions

diff --git a/source/blender/blenkernel/BKE_editmesh.h b/source/blender/blenkernel/BKE_editmesh.h
index 0b6507b85d3..edfb501b590 100644
--- a/source/blender/blenkernel/BKE_editmesh.h
+++ b/source/blender/blenkernel/BKE_editmesh.h
@@ -81,9 +81,6 @@ typedef struct BMEditMesh {
 	/* 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;
diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.h
index 845785a26d7..8d95ab85df8 100644
--- a/source/blender/bmesh/bmesh_class.h
+++ b/source/blender/bmesh/bmesh_class.h
@@ -39,7 +39,6 @@ struct BMLoop;
 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
diff --git a/source/blender/bmesh/operators/bmo_bridge.c b/source/blender/bmesh/operators/bmo_bridge.c
index 37929b4720f..4c3d6139a0c 100644
--- a/source/blender/bmesh/operators/bmo_bridge.c
+++ b/source/blender/bmesh/operators/bmo_bridge.c
@@ -303,7 +303,7 @@ static void bridge_loop_pair(BMesh *bm,
 				}
 			}
 
-			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);