From 15cb567c8e2f35eca15165d376a53802921a9a22 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 30 Mar 2020 18:02:09 +1100 Subject: Armature: remove merge function, use dissolve instead This was crashing, when looking into a fix I noticed that it gave hap-hazard results dissolving past forks in the parent/child hierarchy arbitrarily following one chain. This functionality is almost identical to "dissolve" which delimits forks in the chain predictably. So remove this in favor of dissolve (available from the delete menu). --- source/blender/editors/armature/armature_intern.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source/blender/editors/armature/armature_intern.h') diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h index fa562ab0f44..ba914080d98 100644 --- a/source/blender/editors/armature/armature_intern.h +++ b/source/blender/editors/armature/armature_intern.h @@ -72,7 +72,6 @@ void ARMATURE_OT_hide(struct wmOperatorType *ot); void ARMATURE_OT_reveal(struct wmOperatorType *ot); void ARMATURE_OT_click_extrude(struct wmOperatorType *ot); void ARMATURE_OT_fill(struct wmOperatorType *ot); -void ARMATURE_OT_merge(struct wmOperatorType *ot); void ARMATURE_OT_separate(struct wmOperatorType *ot); void ARMATURE_OT_split(struct wmOperatorType *ot); -- cgit v1.2.3