[Bf-blender-cvs] [c762074b7be] blender2.8: Multi-Objects: ARMATURE_OT_parent_clear

Dalai Felinto noreply at git.blender.org
Sat Oct 6 00:12:34 CEST 2018


Commit: c762074b7bec868ce5354606581887f5cb32bb56
Author: Dalai Felinto
Date:   Fri Oct 5 18:42:55 2018 -0300
Branches: blender2.8
https://developer.blender.org/rBc762074b7bec868ce5354606581887f5cb32bb56

Multi-Objects: ARMATURE_OT_parent_clear

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

M	source/blender/editors/armature/armature_relations.c

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

diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c
index a7f4b7eaa16..28fd80bc354 100644
--- a/source/blender/editors/armature/armature_relations.c
+++ b/source/blender/editors/armature/armature_relations.c
@@ -880,9 +880,8 @@ static void editbone_clear_parent(EditBone *ebone, int mode)
 
 static int armature_parent_clear_exec(bContext *C, wmOperator *op)
 {
-	Object *ob = CTX_data_edit_object(C);
-	bArmature *arm = (bArmature *)ob->data;
-	int val = RNA_enum_get(op->ptr, "type");
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	const int val = RNA_enum_get(op->ptr, "type");
 
 	CTX_DATA_BEGIN(C, EditBone *, ebone, selected_editable_bones)
 	{
@@ -890,10 +889,30 @@ static int armature_parent_clear_exec(bContext *C, wmOperator *op)
 	}
 	CTX_DATA_END;
 
-	ED_armature_edit_sync_selection(arm->edbo);
+	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 *ob = objects[ob_index];
+		bArmature *arm = ob->data;
+		bool changed = false;
 
-	/* note, notifier might evolve */
-	WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, ob);
+		for (EditBone *ebone = arm->edbo->first; ebone; ebone = ebone->next) {
+			if (EBONE_EDITABLE(ebone)) {
+				changed = true;
+				break;
+			}
+		}
+
+		if (!changed) {
+			continue;
+		}
+
+		ED_armature_edit_sync_selection(arm->edbo);
+
+		/* Note, notifier might evolve. */
+		WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, ob);
+	}
+	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
 }



More information about the Bf-blender-cvs mailing list