diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
commit | 9bd0c63382bf226c271c40d5a5967c22c75718ea (patch) | |
tree | 97ad1061c10f39498459d54da34caddd59d39fbd /source/blender/editors/armature | |
parent | be983295ea14af226b3c824a035ccee9d416c67f (diff) | |
parent | af36dd4664ddf35c7ad99f05f9878ce1acf787bd (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/armature')
6 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h index 1fe729b7c4b..a37a2bada08 100644 --- a/source/blender/editors/armature/armature_intern.h +++ b/source/blender/editors/armature/armature_intern.h @@ -251,4 +251,3 @@ int bone_looper(struct Object *ob, struct Bone *bone, void *data, #endif /* __ARMATURE_INTERN_H__ */ - diff --git a/source/blender/editors/armature/armature_naming.c b/source/blender/editors/armature/armature_naming.c index a73e64af0ee..350dee07a2c 100644 --- a/source/blender/editors/armature/armature_naming.c +++ b/source/blender/editors/armature/armature_naming.c @@ -468,4 +468,3 @@ void ARMATURE_OT_autoside_names(wmOperatorType *ot) /* settings */ ot->prop = RNA_def_enum(ot->srna, "type", axis_items, 0, "Axis", "Axis tag names with"); } - diff --git a/source/blender/editors/armature/armature_ops.c b/source/blender/editors/armature/armature_ops.c index cee99c3b8f8..6e6ef86c6f2 100644 --- a/source/blender/editors/armature/armature_ops.c +++ b/source/blender/editors/armature/armature_ops.c @@ -395,4 +395,3 @@ void ED_keymap_armature(wmKeyConfig *keyconf) WM_keymap_add_menu(keymap, "VIEW3D_MT_pose_specials", WKEY, KM_PRESS, 0, 0); WM_keymap_add_menu(keymap, "VIEW3D_MT_pose_propagate", PKEY, KM_PRESS, KM_ALT, 0); } - diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c index cc149d3e42f..e0155a8c435 100644 --- a/source/blender/editors/armature/armature_relations.c +++ b/source/blender/editors/armature/armature_relations.c @@ -909,4 +909,3 @@ void ARMATURE_OT_parent_clear(wmOperatorType *ot) ot->prop = RNA_def_enum(ot->srna, "type", prop_editarm_clear_parent_types, 0, "ClearType", "What way to clear parenting"); } - diff --git a/source/blender/editors/armature/meshlaplacian.h b/source/blender/editors/armature/meshlaplacian.h index 9c4ceacbee6..6758f9d16ac 100644 --- a/source/blender/editors/armature/meshlaplacian.h +++ b/source/blender/editors/armature/meshlaplacian.h @@ -71,4 +71,3 @@ void rigid_deform_end(int cancel); /* ED_mesh_deform_bind_callback(...) defined in ED_armature.h */ #endif - diff --git a/source/blender/editors/armature/pose_select.c b/source/blender/editors/armature/pose_select.c index 75fd952b52a..cafebb6ae95 100644 --- a/source/blender/editors/armature/pose_select.c +++ b/source/blender/editors/armature/pose_select.c @@ -1049,4 +1049,3 @@ void POSE_OT_select_mirror(wmOperatorType *ot) RNA_def_boolean(ot->srna, "only_active", false, "Active Only", "Only operate on the active bone"); RNA_def_boolean(ot->srna, "extend", false, "Extend", "Extend the selection"); } - |