[Bf-blender-cvs] [046ec863ffc] blender2.8: Multi-Objects: MBALL_OT_duplicate_metaelems
Dalai Felinto
noreply at git.blender.org
Fri Nov 2 20:15:34 CET 2018
Commit: 046ec863ffc35e2daae105e4b5911076f1aade1d
Author: Dalai Felinto
Date: Fri Nov 2 16:05:02 2018 -0300
Branches: blender2.8
https://developer.blender.org/rB046ec863ffc35e2daae105e4b5911076f1aade1d
Multi-Objects: MBALL_OT_duplicate_metaelems
===================================================================
M source/blender/editors/metaball/mball_edit.c
===================================================================
diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c
index 31942651318..816d91dbad9 100644
--- a/source/blender/editors/metaball/mball_edit.c
+++ b/source/blender/editors/metaball/mball_edit.c
@@ -436,25 +436,34 @@ void MBALL_OT_select_random_metaelems(struct wmOperatorType *ot)
/* Duplicate selected MetaElements */
static int duplicate_metaelems_exec(bContext *C, wmOperator *UNUSED(op))
{
- Object *obedit = CTX_data_edit_object(C);
- MetaBall *mb = (MetaBall *)obedit->data;
- MetaElem *ml, *newml;
+ ViewLayer *view_layer = CTX_data_view_layer(C);
+ 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];
+ MetaBall *mb = (MetaBall *)obedit->data;
+ MetaElem *ml, *newml;
- ml = mb->editelems->last;
- if (ml) {
- while (ml) {
- if (ml->flag & SELECT) {
- newml = MEM_dupallocN(ml);
- BLI_addtail(mb->editelems, newml);
- mb->lastelem = newml;
- ml->flag &= ~SELECT;
+ if (!BKE_mball_is_any_selected(mb)) {
+ continue;
+ }
+
+ ml = mb->editelems->last;
+ if (ml) {
+ while (ml) {
+ if (ml->flag & SELECT) {
+ newml = MEM_dupallocN(ml);
+ BLI_addtail(mb->editelems, newml);
+ mb->lastelem = newml;
+ ml->flag &= ~SELECT;
+ }
+ ml = ml->prev;
}
- ml = ml->prev;
+ WM_event_add_notifier(C, NC_GEOM | ND_DATA, mb);
+ DEG_id_tag_update(obedit->data, 0);
}
- WM_event_add_notifier(C, NC_GEOM | ND_DATA, mb);
- DEG_id_tag_update(obedit->data, 0);
}
-
+ MEM_freeN(objects);
return OPERATOR_FINISHED;
}
More information about the Bf-blender-cvs
mailing list