Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-03-30 10:02:09 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-03-30 11:18:09 +0300
commit15cb567c8e2f35eca15165d376a53802921a9a22 (patch)
tree692f84930669dd1850ecd733e51338da18565906 /source/blender/editors/armature/armature_ops.c
parent6462ea2a8d7d39043e94f622397ce63e78c478ee (diff)
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).
Diffstat (limited to 'source/blender/editors/armature/armature_ops.c')
-rw-r--r--source/blender/editors/armature/armature_ops.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/editors/armature/armature_ops.c b/source/blender/editors/armature/armature_ops.c
index a29d0f5f158..097d384a609 100644
--- a/source/blender/editors/armature/armature_ops.c
+++ b/source/blender/editors/armature/armature_ops.c
@@ -68,7 +68,6 @@ void ED_operatortypes_armature(void)
WM_operatortype_append(ARMATURE_OT_reveal);
WM_operatortype_append(ARMATURE_OT_click_extrude);
WM_operatortype_append(ARMATURE_OT_fill);
- WM_operatortype_append(ARMATURE_OT_merge);
WM_operatortype_append(ARMATURE_OT_separate);
WM_operatortype_append(ARMATURE_OT_split);