bugfix

* ntreeCompositExecTree accessed 'ntree' before NULL check.
* BM_face_triangulate accessed 'f' before NULL check.

also quiet warning in BKE_text_to_curve() and add a check for BMesh bridge loops so it knows quicker if it can copy loop data or not.

1 files changed, 14 insertions, 10 deletions

diff --git a/source/blender/bmesh/operators/bmo_connect.c b/source/blender/bmesh/operators/bmo_connect.c
index 2beed279f4b..ad15b703041 100644
--- a/source/blender/bmesh/operators/bmo_connect.c
+++ b/source/blender/bmesh/operators/bmo_connect.c
@@ -167,16 +167,20 @@ static void bm_vert_loop_pair(BMesh *bm, BMVert *v1, BMVert *v2, BMLoop **l1, BM
 	BMIter liter;
 	BMLoop *l;
 
-	BM_ITER(l, &liter, bm, BM_LOOPS_OF_VERT, v1) {
-		if (l->prev->v == v2) {
-			*l1 = l;
-			*l2 = l->prev;
-			return;
-		}
-		else if (l->next->v == v2) {
-			*l1 = l;
-			*l2 = l->next;
-			return;
+	if ((v1->e && v1->e->l) &&
+	    (v2->e && v2->e->l))
+	{
+		BM_ITER(l, &liter, bm, BM_LOOPS_OF_VERT, v1) {
+			if (l->prev->v == v2) {
+				*l1 = l;
+				*l2 = l->prev;
+				return;
+			}
+			else if (l->next->v == v2) {
+				*l1 = l;
+				*l2 = l->next;
+				return;
+			}
 		}
 	}