Merge branch 'gooseberry' into temp_motionpathstemp_motionpaths

Conflicts:
	source/blender/blenkernel/intern/object.c

1 files changed, 8 insertions, 4 deletions

diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c
index 871bee64c19..74bcbbaf463 100644
--- a/source/blender/bmesh/operators/bmo_removedoubles.c
+++ b/source/blender/bmesh/operators/bmo_removedoubles.c
@@ -380,8 +380,11 @@ void bmo_collapse_exec(BMesh *bm, BMOperator *op)
 	float min[3], max[3], center[3];
 	unsigned int i, tot;
 	BMOpSlot *slot_targetmap;
-	
-	BMO_op_callf(bm, op->flag, "collapse_uvs edges=%s", op, "edges");
+
+	if (BMO_slot_bool_get(op->slots_in, "uvs")) {
+		BMO_op_callf(bm, op->flag, "collapse_uvs edges=%s", op, "edges");
+	}
+
 	BMO_op_init(bm, &weldop, op->flag, "weld_verts");
 	slot_targetmap = BMO_slot_get(weldop.slots_in, "targetmap");
 
@@ -519,8 +522,9 @@ void bmo_collapse_uvs_exec(BMesh *bm, BMOperator *op)
 
 }
 
-static void bmesh_find_doubles_common(BMesh *bm, BMOperator *op,
-                                      BMOperator *optarget, BMOpSlot *optarget_slot)
+static void bmesh_find_doubles_common(
+        BMesh *bm, BMOperator *op,
+        BMOperator *optarget, BMOpSlot *optarget_slot)
 {
 	BMVert  **verts;
 	int       verts_len;