[Bf-blender-cvs] [07747bcd67b] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 07747bcd67b6c8a829febeb34b64c47d0ad8a344
Author: Campbell Barton
Date:   Wed Sep 26 10:29:16 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB07747bcd67b6c8a829febeb34b64c47d0ad8a344

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/mesh/editmesh_extrude_spin.c
index 4f9aab165d0,88407576ec0..c1187da38d5
--- a/source/blender/editors/mesh/editmesh_extrude_spin.c
+++ b/source/blender/editors/mesh/editmesh_extrude_spin.c
@@@ -79,35 -79,26 +84,38 @@@ static int edbm_spin_exec(bContext *C, 
  		return OPERATOR_CANCELLED;
  	}
  
 -	/* keep the values in worldspace since we're passing the obmat */
 -	if (!EDBM_op_init(
 -	            em, &spinop, op,
 -	            "spin geom=%hvef cent=%v axis=%v dvec=%v steps=%i angle=%f space=%m4 "
 -	            "use_normal_flip=%b use_duplicate=%b use_merge=%b",
 -	            BM_ELEM_SELECT, cent, axis, d, steps, -angle, obedit->obmat,
 -	            use_normal_flip, dupli, use_auto_merge))
 -	{
 -		return OPERATOR_CANCELLED;
 -	}
 -	BMO_op_exec(bm, &spinop);
 -	if (use_auto_merge == false) {
 -		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
 -		BMO_slot_buffer_hflag_enable(bm, spinop.slots_out, "geom_last.out", BM_ALL_NOLOOP, BM_ELEM_SELECT, true);
 -	}
 -	if (!EDBM_op_finish(em, &spinop, op, true)) {
 -		return OPERATOR_CANCELLED;
 +	uint objects_len = 0;
 +	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 +
 +	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
 +		Object *obedit = objects[ob_index];
 +		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 +		BMesh *bm = em->bm;
 +		BMOperator spinop;
 +
 +		/* keep the values in worldspace since we're passing the obmat */
 +		if (!EDBM_op_init(
 +		            em, &spinop, op,
 +		            "spin geom=%hvef cent=%v axis=%v dvec=%v steps=%i angle=%f space=%m4 "
- 		            "use_normal_flip=%b use_duplicate=%b",
- 		            BM_ELEM_SELECT, cent, axis, d, steps, -angle, obedit->obmat, use_normal_flip, dupli))
++		            "use_normal_flip=%b use_duplicate=%b use_merge=%b",
++		            BM_ELEM_SELECT, cent, axis, d, steps, -angle, obedit->obmat,
++		            use_normal_flip, dupli, use_auto_merge))
 +		{
 +			continue;
 +		}
 +		BMO_op_exec(bm, &spinop);
- 		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
- 		BMO_slot_buffer_hflag_enable(bm, spinop.slots_out, "geom_last.out", BM_ALL_NOLOOP, BM_ELEM_SELECT, true);
++		if (use_auto_merge == false) {
++			EDBM_flag_disable_all(em, BM_ELEM_SELECT);
++			BMO_slot_buffer_hflag_enable(bm, spinop.slots_out, "geom_last.out", BM_ALL_NOLOOP, BM_ELEM_SELECT, true);
++		}
 +		if (!EDBM_op_finish(em, &spinop, op, true)) {
 +			continue;
 +		}
 +
 +		EDBM_update_generic(em, true, true);
  	}
  
 -	EDBM_update_generic(em, true, true);
 +	MEM_freeN(objects);
  
  	return OPERATOR_FINISHED;
  }