Merge branch 'master' into soc-2013-depsgraph_mtsoc-2013-depsgraph_mt

Conflicts:
	source/blender/blenkernel/intern/constraint.c
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/scene.c
	source/blender/blenkernel/intern/shrinkwrap.c
	source/blender/collada/AnimationExporter.cpp
	source/blender/editors/space_image/image_ops.c
	source/blender/editors/space_view3d/view3d_view.c
	source/blender/makesrna/intern/rna_scene.c
	source/blender/modifiers/intern/MOD_util.c
	source/blender/render/intern/source/pipeline.c

1 files changed, 10 insertions, 15 deletions

diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c
index b3b9cecf389..723595771a1 100644
--- a/source/blender/bmesh/operators/bmo_subdivide.c
+++ b/source/blender/bmesh/operators/bmo_subdivide.c
@@ -133,28 +133,23 @@ typedef struct SubDPattern {
 
 /* connects face with smallest len, which I think should always be correct for
  * edge subdivision */
-static BMEdge *connect_smallest_face(BMesh *bm, BMVert *v1, BMVert *v2, BMFace **r_f_new)
+static BMEdge *connect_smallest_face(BMesh *bm, BMVert *v_a, BMVert *v_b, BMFace **r_f_new)
 {
-	BMIter iter, iter2;
-	BMVert *v;
 	BMLoop *l_new;
-	BMFace *f, *f_cur = NULL;
+	BMLoop *l_a, *l_b;
+	BMFace *f;
 
 	/* this isn't the best thing in the world.  it doesn't handle cases where there's
 	 * multiple faces yet.  that might require a convexity test to figure out which
 	 * face is "best" and who knows what for non-manifold conditions. */
-	for (f = BM_iter_new(&iter, bm, BM_FACES_OF_VERT, v1); f; f = BM_iter_step(&iter)) {
-		for (v = BM_iter_new(&iter2, bm, BM_VERTS_OF_FACE, f); v; v = BM_iter_step(&iter2)) {
-			if (v == v2) {
-				if (!f_cur || f->len < f_cur->len) f_cur = f;
-			}
-		}
-	}
+	f = BM_vert_pair_share_face(v_a, v_b, &l_a, &l_b);
+
+	if (f) {
+		BMFace *f_new;
 
-	if (f_cur) {
-		f = BM_face_split(bm, f_cur, v1, v2, &l_new, NULL, false);
+		f_new = BM_face_split(bm, f, l_a, l_b, &l_new, NULL, false);
 		
-		if (r_f_new) *r_f_new = f;
+		if (r_f_new) *r_f_new = f_new;
 		return l_new ? l_new->e : NULL;
 	}
 
@@ -1118,7 +1113,7 @@ void bmo_subdivide_edges_exec(BMesh *bm, BMOperator *op)
 				if (loops_split[j][0]) {
 					BMFace *f_new;
 					BLI_assert(BM_edge_exists(loops_split[j][0]->v, loops_split[j][1]->v) == NULL);
-					f_new = BM_face_split(bm, face, loops_split[j][0]->v, loops_split[j][1]->v, &l_new, NULL, false);
+					f_new = BM_face_split(bm, face, loops_split[j][0], loops_split[j][1], &l_new, NULL, false);
 					if (f_new) {
 						BMO_elem_flag_enable(bm, l_new->e, ELE_INNER);
 					}