Fix own mistake with zealous check for face splitting

Was disallowing adjacent loops to be split which is correct for a single
split across a face, but not fore BM_face_split_n

2 files changed, 3 insertions, 3 deletions

diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c
index 6d8dc531a32..a7e3c12e5d7 100644
--- a/source/blender/bmesh/intern/bmesh_mods.c
+++ b/source/blender/bmesh/intern/bmesh_mods.c
@@ -365,10 +365,10 @@ BMFace *BM_face_split_n(BMesh *bm, BMFace *f,
 
 	BLI_assert(l_a != l_b);
 	BLI_assert(f == l_a->f && f == l_b->f);
-	BLI_assert(!BM_loop_is_adjacent(l_a, l_b));
+	BLI_assert(!((n == 0) && BM_loop_is_adjacent(l_a, l_b)));
 
 	/* could be an assert */
-	if (UNLIKELY(BM_loop_is_adjacent(l_a, l_b))) {
+	if (UNLIKELY((n == 0) && BM_loop_is_adjacent(l_a, l_b))) {
 		return NULL;
 	}
 
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index e8547b7c164..5f133aea2bb 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -659,7 +659,7 @@ static void node_buts_image_user(uiLayout *layout, bContext *C, PointerRNA *ptr,
 		/* don't use iuser->framenr directly because it may not be updated if auto-refresh is off */
 		Scene *scene = CTX_data_scene(C);
 		ImageUser *iuser = iuserptr->data;
-		Image *ima = imaptr->data;
+		/* Image *ima = imaptr->data; */  /* UNUSED */
 
 		char numstr[32];
 		const int framenr = BKE_image_user_frame_get(iuser, CFRA, 0, NULL);