diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-03-30 10:02:09 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-30 11:18:09 +0300 |
| commit | 15cb567c8e2f35eca15165d376a53802921a9a22 (patch) | |
| tree | 692f84930669dd1850ecd733e51338da18565906 /source/blender/editors/armature/armature_intern.h | |
| parent | 6462ea2a8d7d39043e94f622397ce63e78c478ee (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_intern.h')
| -rw-r--r-- | source/blender/editors/armature/armature_intern.h | 1 |
1 files changed, 0 insertions, 1 deletions
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); |