diff options
Diffstat (limited to 'source/blender/editors/include/ED_armature.h')
| -rw-r--r-- | source/blender/editors/include/ED_armature.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index 541e2633512..d82c7126cf2 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -34,7 +34,6 @@ struct Depsgraph; struct IDProperty; struct ListBase; struct Main; -struct Main; struct Mesh; struct MeshDeformModifierData; struct Object; @@ -174,7 +173,7 @@ void ED_operatormacros_armature(void); void ED_keymap_armature(struct wmKeyConfig *keyconf); /* armature_relations.c */ -int join_armature_exec(struct bContext *C, struct wmOperator *op); +int ED_armature_join_objects_exec(struct bContext *C, struct wmOperator *op); /* armature_select.c */ struct Base *ED_armature_base_and_ebone_from_select_buffer(struct Base **bases, |