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, 1 insertions, 1 deletions

diff --git a/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c b/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
index 868caa49ec7..092a004aece 100644
--- a/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
+++ b/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
@@ -144,7 +144,7 @@ static bool bm_vert_dissolve_fan(BMesh *bm, BMVert *v)
 			if (l->f->len > 3) {
 				BMLoop *l_new;
 				BLI_assert(l->prev->v != l->next->v);
-				BM_face_split(bm, l->f, l->prev->v, l->next->v, &l_new, NULL, true);
+				BM_face_split(bm, l->f, l->prev, l->next, &l_new, NULL, true);
 				BM_elem_flag_merge_into(l_new->e, l->e, l->prev->e);
 			}
 		}