Commit: 9e2ea6c500a3a5774a1aa174b6801d3a9edadd9a Author: Campbell Barton Date: Sun Apr 15 12:03:09 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB9e2ea6c500a3a5774a1aa174b6801d3a9edadd9a
Merge branch 'master' into blender2.8 =================================================================== =================================================================== diff --cc source/blender/editors/armature/armature_select.c index 397691a409b,d81e557dbfd..7149fb15f45 --- a/source/blender/editors/armature/armature_select.c +++ b/source/blender/editors/armature/armature_select.c @@@ -99,8 -98,8 +99,8 @@@ void *get_bone_from_selectbuffer /* Determine what the current bone is */ if (obedit == NULL || base->object != obedit) { /* no singular posemode, so check for correct object */ - if (base->selcol == (hitresult & 0xFFFF)) { + if (base->object->select_color == (hitresult & 0xFFFF)) { - bone = get_indexed_bone(base->object, hitresult); + bone = ED_armature_bone_find_index(base->object, hitresult); if (findunsel) sel = (bone->flag & BONE_SELECTED); diff --cc source/blender/editors/armature/armature_skinning.c index 5c8e08a0d89,0458fc4ed1b..e25056a7a4a --- a/source/blender/editors/armature/armature_skinning.c +++ b/source/blender/editors/armature/armature_skinning.c @@@ -431,9 -424,8 +431,9 @@@ static void add_verts_to_dgroups MEM_freeN(verts); } - void create_vgroups_from_armature( -void ED_object_vgroup_calc_from_armature(ReportList *reports, Scene *scene, Object *ob, Object *par, - const int mode, const bool mirror) ++void ED_object_vgroup_calc_from_armature( + ReportList *reports, const EvaluationContext *eval_ctx, Scene *scene, Object *ob, Object *par, + const int mode, const bool mirror) { /* Lets try to create some vertex groups * based on the bones of the parent armature. diff --cc source/blender/editors/armature/pose_select.c index a66cedd8d4f,4b62fd15c04..1c23f71233d --- a/source/blender/editors/armature/pose_select.c +++ b/source/blender/editors/armature/pose_select.c @@@ -133,8 -132,8 +133,8 @@@ void ED_pose_bone_select(Object *ob, bP /* called from editview.c, for mode-less pose selection */ /* assumes scene obact and basact is still on old situation */ - bool ED_do_pose_selectbuffer( + bool ED_armature_pose_select_pick_with_buffer( - Scene *scene, Base *base, const unsigned int *buffer, short hits, + ViewLayer *view_layer, Base *base, const unsigned int *buffer, short hits, bool extend, bool deselect, bool toggle, bool do_nearest) { Object *ob = base->object; diff --cc source/blender/editors/include/ED_armature.h index 0dcc4f32e43,567e477ec6c..186ca5313e5 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@@ -139,29 -130,30 +139,30 @@@ void ED_armature_from_edit(struct bArma void ED_armature_to_edit(struct bArmature *arm); void ED_armature_edit_free(struct bArmature *arm); - void ED_armature_deselect_all(struct Object *obedit); - void ED_armature_deselect_all_visible(struct Object *obedit); + void ED_armature_edit_deselect_all(struct Object *obedit); + void ED_armature_edit_deselect_all_visible(struct Object *obedit); - bool ED_do_pose_selectbuffer( + bool ED_armature_pose_select_pick_with_buffer( - struct Scene *scene, struct Base *base, const unsigned int *buffer, short hits, + struct ViewLayer *view_layer, struct Base *base, const unsigned int *buffer, short hits, bool extend, bool deselect, bool toggle, bool do_nearest); - bool ED_armature_select_pick(struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle); + bool ED_armature_edit_select_pick( + struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle); int join_armature_exec(struct bContext *C, struct wmOperator *op); - struct Bone *get_indexed_bone(struct Object *ob, int index); - float ED_rollBoneToVector(EditBone *bone, const float new_up_axis[3], const bool axis_only); - EditBone *ED_armature_bone_find_name(const struct ListBase *edbo, const char *name); - EditBone *ED_armature_bone_get_mirrored(const struct ListBase *edbo, EditBone *ebo); - void ED_armature_sync_selection(struct ListBase *edbo); - void ED_armature_validate_active(struct bArmature *arm); + struct Bone *ED_armature_bone_find_index(struct Object *ob, int index); + float ED_armature_ebone_roll_to_vector(const EditBone *bone, const float new_up_axis[3], const bool axis_only); + EditBone *ED_armature_ebone_find_name(const struct ListBase *edbo, const char *name); + EditBone *ED_armature_ebone_get_mirrored(const struct ListBase *edbo, EditBone *ebo); + void ED_armature_edit_sync_selection(struct ListBase *edbo); + void ED_armature_edit_validate_active(struct bArmature *arm); - EditBone *ED_armature_edit_bone_add_primitive(struct Object *obedit_arm, float length, bool view_aligned); - EditBone *ED_armature_edit_bone_add(struct bArmature *arm, const char *name); + EditBone *ED_armature_ebone_add_primitive(struct Object *obedit_arm, float length, bool view_aligned); + EditBone *ED_armature_ebone_add(struct bArmature *arm, const char *name); - void ED_armature_edit_bone_remove_ex(struct bArmature *arm, EditBone *exBone, bool clear_connected); - void ED_armature_edit_bone_remove(struct bArmature *arm, EditBone *exBone); + void ED_armature_ebone_remove_ex(struct bArmature *arm, EditBone *exBone, bool clear_connected); + void ED_armature_ebone_remove(struct bArmature *arm, EditBone *exBone); bool ED_armature_ebone_is_child_recursive(EditBone *ebone_parent, EditBone *ebone_child); - EditBone *ED_armature_bone_find_shared_parent(EditBone *ebone_child[], const unsigned int ebone_child_tot); + EditBone *ED_armature_ebone_find_shared_parent(EditBone *ebone_child[], const unsigned int ebone_child_tot); void ED_armature_ebone_to_mat3(EditBone *ebone, float mat[3][3]); void ED_armature_ebone_to_mat4(EditBone *ebone, float mat[4][4]); @@@ -169,23 -161,22 +170,23 @@@ void ED_armature_ebone_from_mat3(EditBone *ebone, float mat[3][3]); void ED_armature_ebone_from_mat4(EditBone *ebone, float mat[4][4]); - void transform_armature_mirror_update(struct Object *obedit); + void ED_armature_edit_transform_mirror_update(struct Object *obedit); -void ED_armature_origin_set(struct Scene *scene, struct Object *ob, float cursor[3], int centermode, int around); +void ED_armature_origin_set(struct Object *ob, float cursor[3], int centermode, int around); void ED_armature_transform_bones(struct bArmature *arm, float mat[4][4], const bool do_props); - void ED_armature_apply_transform(struct Object *ob, float mat[4][4], const bool do_props); + void ED_armature_transform_apply(struct Object *ob, float mat[4][4], const bool do_props); void ED_armature_transform(struct bArmature *arm, float mat[4][4], const bool do_props); #define ARM_GROUPS_NAME 1 #define ARM_GROUPS_ENVELOPE 2 #define ARM_GROUPS_AUTO 3 - void create_vgroups_from_armature( -void ED_object_vgroup_calc_from_armature(struct ReportList *reports, struct Scene *scene, struct Object *ob, - struct Object *par, const int mode, const bool mirror); ++void ED_object_vgroup_calc_from_armature( + struct ReportList *reports, const struct EvaluationContext *eval_ctx, struct Scene *scene, + struct Object *ob, struct Object *par, const int mode, const bool mirror); /* if bone is already in list, pass it as param to ignore it */ - void unique_editbone_name(struct ListBase *ebones, char *name, EditBone *bone); + void ED_armature_ebone_unique_name(struct ListBase *ebones, char *name, EditBone *bone); void ED_armature_bone_rename(struct bArmature *arm, const char *oldnamep, const char *newnamep); void ED_armature_bones_flip_names(struct bArmature *arm, struct ListBase *bones_names, const bool do_strip_numbers); @@@ -205,13 -196,13 +206,13 @@@ void ED_armature_ebone_listbase_free(st void ED_armature_ebone_listbase_copy(struct ListBase *lb_dst, struct ListBase *lb_src); /* poseobject.c */ -bool ED_object_posemode_exit_ex(struct Object *ob); +bool ED_object_posemode_exit_ex(struct Main *bmain, struct Object *ob); bool ED_object_posemode_exit(struct bContext *C, struct Object *ob); -bool ED_object_posemode_enter_ex(struct Object *ob); +bool ED_object_posemode_enter_ex(struct Main *bmain, struct Object *ob); bool ED_object_posemode_enter(struct bContext *C, struct Object *ob); - void ED_pose_de_selectall(struct Object *ob, int select_mode, const bool ignore_visibility); + void ED_pose_deselect_all(struct Object *ob, int select_mode, const bool ignore_visibility); void ED_pose_bone_select(struct Object *ob, struct bPoseChannel *pchan, bool select); -void ED_pose_recalculate_paths(struct Scene *scene, struct Object *ob); +void ED_pose_recalculate_paths(struct bContext *C, struct Scene *scene, struct Object *ob); struct Object *ED_pose_object_from_context(struct bContext *C); /* sketch */ @@@ -235,11 -226,11 +236,12 @@@ void BDR_drawSketch(const struct bConte int BDR_drawSketchNames(struct ViewContext *vc); /* meshlaplacian.c */ - void mesh_deform_bind(struct Scene *scene, -void ED_mesh_deform_bind_callback(struct Scene *scene, -- struct MeshDeformModifierData *mmd, -- struct DerivedMesh *cagedm, -- float *vertexcos, int totvert, float cagemat[4][4]); -- ++void ED_mesh_deform_bind_callback( ++ struct Scene *scene, ++ struct MeshDeformModifierData *mmd, ++ struct DerivedMesh *cagedm, ++ float *vertexcos, int totvert, float cagemat[4][4]); ++ #ifdef __cplusplus } #endif diff --cc source/blender/editors/object/object_relations.c index 3443a268ef2,4618d05133e..ba58c0d3d2a --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@@ -784,15 -772,13 +784,15 @@@ bool ED_object_parent_set(ReportList *r copy_v3_v3(ob->loc, vec); } else if (pararm && (ob->type == OB_MESH) && (par->type == OB_ARMATURE)) { - if (partype == PAR_ARMATURE_NAME) - ED_object_vgroup_calc_from_armature(reports, scene, ob, par, ARM_GROUPS_NAME, false); - else if (partype == PAR_ARMATURE_ENVELOPE) - ED_object_vgroup_calc_from_armature(reports, scene, ob, par, ARM_GROUPS_ENVELOPE, xmirror); + if (partype == PAR_ARMATURE_NAME) { - create_vgroups_from_armature(reports, @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs