diff options
Diffstat (limited to 'source/blender/editors/armature')
| -rw-r--r-- | source/blender/editors/armature/armature_add.c | 7 | ||||
| -rw-r--r-- | source/blender/editors/armature/armature_edit.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/armature/armature_relations.c | 11 | ||||
| -rw-r--r-- | source/blender/editors/armature/armature_utils.c | 9 | ||||
| -rw-r--r-- | source/blender/editors/armature/meshlaplacian.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/armature/pose_lib.c | 17 | ||||
| -rw-r--r-- | source/blender/editors/armature/pose_select.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/armature/pose_slide.c | 56 | ||||
| -rw-r--r-- | source/blender/editors/armature/pose_transform.c | 11 | ||||
| -rw-r--r-- | source/blender/editors/armature/pose_utils.c | 3 |
10 files changed, 83 insertions, 39 deletions
diff --git a/source/blender/editors/armature/armature_add.c b/source/blender/editors/armature/armature_add.c index fb0766d3bed..aa95530d1a6 100644 --- a/source/blender/editors/armature/armature_add.c +++ b/source/blender/editors/armature/armature_add.c @@ -491,7 +491,9 @@ static int armature_duplicate_selected_exec(bContext *C, wmOperator *op) Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, CTX_wm_view3d(C), &objects_len); for (uint ob_index = 0; ob_index < objects_len; ob_index++) { EditBone *ebone_iter; - EditBone *ebone_first_dupe = NULL; /* The beginning of the duplicated bones in the edbo list */ + /* The beginning of the duplicated bones in the edbo list */ + EditBone *ebone_first_dupe = NULL; + Object *ob = objects[ob_index]; bArmature *arm = ob->data; @@ -664,7 +666,8 @@ static int armature_symmetrize_exec(bContext *C, wmOperator *op) bArmature *arm = obedit->data; EditBone *ebone_iter; - EditBone *ebone_first_dupe = NULL; /* The beginning of the duplicated mirrored bones in the edbo list */ + /* The beginning of the duplicated mirrored bones in the edbo list */ + EditBone *ebone_first_dupe = NULL; ED_armature_edit_sync_selection(arm->edbo); // XXX why is this needed? diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c index 7aa6b578475..c262cbdd556 100644 --- a/source/blender/editors/armature/armature_edit.c +++ b/source/blender/editors/armature/armature_edit.c @@ -87,7 +87,7 @@ void ED_armature_transform_apply(Main *bmain, Object *ob, float mat[4][4], const void ED_armature_transform_bones(struct bArmature *arm, float mat[4][4], const bool do_props) { EditBone *ebone; - float scale = mat4_to_scale(mat); /* store the scale of the matrix here to use on envelopes */ + float scale = mat4_to_scale(mat); /* store the scale of the matrix here to use on envelopes */ float mat3[3][3]; copy_m3_m4(mat3, mat); diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c index aadb805feda..e48c2df74e5 100644 --- a/source/blender/editors/armature/armature_relations.c +++ b/source/blender/editors/armature/armature_relations.c @@ -144,7 +144,8 @@ static void joined_armature_fix_animdata_cb(ID *id, FCurve *fcu, void *user_data const char *old_name = BLI_ghashIterator_getKey(&gh_iter); const char *new_name = BLI_ghashIterator_getValue(&gh_iter); - /* only remap if changed; this still means there will be some waste if there aren't many drivers/keys */ + /* only remap if changed; this still means there will be some + * waste if there aren't many drivers/keys */ if (!STREQ(old_name, new_name) && strstr(fcu->rna_path, old_name)) { fcu->rna_path = BKE_animsys_fix_rna_path_rename(id, fcu->rna_path, "pose.bones", old_name, new_name, 0, 0, false); @@ -542,7 +543,8 @@ static void separate_armature_bones(Main *bmain, Object *ob, short sel) for (ebo = arm->edbo->first; ebo; ebo = ebo->next) { if (ebo->parent == curbone) { ebo->parent = NULL; - ebo->temp.p = NULL; /* this is needed to prevent random crashes with in ED_armature_from_edit */ + /* this is needed to prevent random crashes with in ED_armature_from_edit */ + ebo->temp.p = NULL; ebo->flag &= ~BONE_CONNECTED; } } @@ -623,7 +625,10 @@ static int separate_armature_exec(bContext *C, wmOperator *op) ED_armature_edit_free(obedit->data); /* 2) duplicate base */ - newbase = ED_object_add_duplicate(bmain, scene, view_layer, oldbase, USER_DUP_ARM); /* only duplicate linked armature */ + + /* only duplicate linked armature */ + newbase = ED_object_add_duplicate(bmain, scene, view_layer, oldbase, USER_DUP_ARM); + DEG_relations_tag_update(bmain); newob = newbase->object; diff --git a/source/blender/editors/armature/armature_utils.c b/source/blender/editors/armature/armature_utils.c index 275d00ded58..6409d544825 100644 --- a/source/blender/editors/armature/armature_utils.c +++ b/source/blender/editors/armature/armature_utils.c @@ -672,7 +672,9 @@ void ED_armature_from_edit(Main *bmain, bArmature *arm) if (eBone == arm->act_edbone) { /* don't change active selection, this messes up separate which uses * editmode toggle and can separate active bone which is de-selected originally */ - /* newBone->flag |= BONE_SELECTED; */ /* important, editbones can be active with only 1 point selected */ + + /* important, editbones can be active with only 1 point selected */ + /* newBone->flag |= BONE_SELECTED; */ arm->act_bone = newBone; } newBone->roll = 0.0f; @@ -707,8 +709,9 @@ void ED_armature_from_edit(Main *bmain, bArmature *arm) } /* Fix parenting in a separate pass to ensure ebone->bone connections are valid at this point. - * Do not set bone->head/tail here anymore, using EditBone data for that is not OK since our later fiddling - * with parent's arm_mat (for roll conversion) may have some small but visible impact on locations (T46010). */ + * Do not set bone->head/tail here anymore, + * using EditBone data for that is not OK since our later fiddling with parent's arm_mat + * (for roll conversion) may have some small but visible impact on locations (T46010). */ for (eBone = arm->edbo->first; eBone; eBone = eBone->next) { newBone = eBone->temp.bone; if (eBone->parent) { diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index 96799304845..b427843085a 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -1466,7 +1466,8 @@ static void harmonic_coordinates_bind(MeshDeformModifierData *mmd, MeshDeformBin mdb->cagemesh_cache.mpoly = me->mpoly; mdb->cagemesh_cache.mloop = me->mloop; mdb->cagemesh_cache.looptri = BKE_mesh_runtime_looptri_ensure(me); - mdb->cagemesh_cache.poly_nors = CustomData_get_layer(&me->pdata, CD_NORMAL); /* can be NULL */ + /* can be NULL */ + mdb->cagemesh_cache.poly_nors = CustomData_get_layer(&me->pdata, CD_NORMAL); } /* make bounding box equal size in all directions, add padding, and compute diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c index c8ce0774208..30f0b82396a 100644 --- a/source/blender/editors/armature/pose_lib.c +++ b/source/blender/editors/armature/pose_lib.c @@ -498,7 +498,10 @@ static int poselib_add_exec(bContext *C, wmOperator *op) BLI_uniquename(&act->markers, marker, DATA_("Pose"), '.', offsetof(TimeMarker, name), sizeof(marker->name)); /* use Keying Set to determine what to store for the pose */ - ks = ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_WHOLE_CHARACTER_SELECTED_ID); /* this includes custom props :)*/ + + /* this includes custom props :)*/ + ks = ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_WHOLE_CHARACTER_SELECTED_ID); + ANIM_apply_keyingset(C, NULL, act, ks, MODIFYKEY_MODE_INSERT, (float)frame); /* store new 'active' pose number */ @@ -730,7 +733,8 @@ void POSELIB_OT_pose_rename(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* properties */ - /* NOTE: name not pose is the operator's "main" property, so that it will get activated in the popup for easy renaming */ + /* NOTE: name not pose is the operator's "main" property, + * so that it will get activated in the popup for easy renaming */ ot->prop = RNA_def_string(ot->srna, "name", "RenamedPose", 64, "New Pose Name", "New name for pose"); prop = RNA_def_enum(ot->srna, "pose", DummyRNA_NULL_items, 0, "Pose", "The pose to rename"); RNA_def_enum_funcs(prop, poselib_stored_pose_itemf); @@ -963,7 +967,8 @@ static void poselib_backup_restore(tPoseLib_PreviewData *pld) if (plb->oldprops) IDP_SyncGroupValues(plb->pchan->prop, plb->oldprops); - /* TODO: constraints settings aren't restored yet, even though these could change (though not that likely) */ + /* TODO: constraints settings aren't restored yet, + * even though these could change (though not that likely) */ } } @@ -1785,7 +1790,11 @@ void POSELIB_OT_browse_interactive(wmOperatorType *ot) // XXX: percentage vs factor? /* not used yet */ - /* RNA_def_float_factor(ot->srna, "blend_factor", 1.0f, 0.0f, 1.0f, "Blend Factor", "Amount that the pose is applied on top of the existing poses", 0.0f, 1.0f); */ +#if 0 + RNA_def_float_factor( + ot->srna, "blend_factor", 1.0f, 0.0f, 1.0f, "Blend Factor", + "Amount that the pose is applied on top of the existing poses", 0.0f, 1.0f); +#endif } void POSELIB_OT_apply_pose(wmOperatorType *ot) diff --git a/source/blender/editors/armature/pose_select.c b/source/blender/editors/armature/pose_select.c index 184c09f5b10..1916495465c 100644 --- a/source/blender/editors/armature/pose_select.c +++ b/source/blender/editors/armature/pose_select.c @@ -239,7 +239,8 @@ bool ED_armature_pose_select_pick_with_buffer( } /* 'select_mode' is usual SEL_SELECT/SEL_DESELECT/SEL_TOGGLE/SEL_INVERT. - * When true, 'ignore_visibility' makes this func also affect invisible bones (hidden or on hidden layers). */ + * When true, 'ignore_visibility' makes this func also affect invisible bones + * (hidden or on hidden layers). */ bool ED_pose_deselect_all(Object *ob, int select_mode, const bool ignore_visibility) { bArmature *arm = ob->data; diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c index 52e580a94af..7ba22fca2f6 100644 --- a/source/blender/editors/armature/pose_slide.c +++ b/source/blender/editors/armature/pose_slide.c @@ -87,28 +87,43 @@ /* Temporary data shared between these operators */ typedef struct tPoseSlideOp { - Scene *scene; /* current scene */ - ScrArea *sa; /* area that we're operating in (needed for modal()) */ - ARegion *ar; /* region that we're operating in (needed for modal()) */ - uint objects_len; /* len of the PoseSlideObject array. */ - - ListBase pfLinks; /* links between posechannels and f-curves for all the pose objects. */ - DLRBT_Tree keys; /* binary tree for quicker searching for keyframes (when applicable) */ + /** current scene */ + Scene *scene; + /** area that we're operating in (needed for modal()) */ + ScrArea *sa; + /** region that we're operating in (needed for modal()) */ + ARegion *ar; + /** len of the PoseSlideObject array. */ + uint objects_len; + + /** links between posechannels and f-curves for all the pose objects. */ + ListBase pfLinks; + /** binary tree for quicker searching for keyframes (when applicable) */ + DLRBT_Tree keys; - int cframe; /* current frame number - global time */ + /** current frame number - global time */ + int cframe; - int prevFrame; /* frame before current frame (blend-from) - global time */ - int nextFrame; /* frame after current frame (blend-to) - global time */ + /** frame before current frame (blend-from) - global time */ + int prevFrame; + /** frame after current frame (blend-to) - global time */ + int nextFrame; - short mode; /* sliding mode (ePoseSlide_Modes) */ - short flag; /* unused for now, but can later get used for storing runtime settings.... */ + /** sliding mode (ePoseSlide_Modes) */ + short mode; + /** unused for now, but can later get used for storing runtime settings.... */ + short flag; - short channels; /* which transforms/channels are affected (ePoseSlide_Channels) */ - short axislock; /* axis-limits for transforms (ePoseSlide_AxisLock) */ + /** which transforms/channels are affected (ePoseSlide_Channels) */ + short channels; + /** axis-limits for transforms (ePoseSlide_AxisLock) */ + short axislock; - float percentage; /* 0-1 value for determining the influence of whatever is relevant */ + /** 0-1 value for determining the influence of whatever is relevant */ + float percentage; - NumInput num; /* numeric input */ + /** numeric input */ + NumInput num; struct tPoseSlideObject *ob_data_array; } tPoseSlideOp; @@ -361,7 +376,8 @@ static void pose_slide_apply_val( * - numerator should be larger than denominator to 'expand' the result * - perform this weighting a number of times given by the percentage... */ - int iters = (int)ceil(10.0f * pso->percentage); /* TODO: maybe a sensitivity ctrl on top of this is needed */ + /* TODO: maybe a sensitivity ctrl on top of this is needed */ + int iters = (int)ceil(10.0f * pso->percentage); while (iters-- > 0) { (*val) = (-((sVal * w2) + (eVal * w1)) + ((*val) * 6.0f) ) / 5.0f; @@ -374,7 +390,8 @@ static void pose_slide_apply_val( * - numerator should be smaller than denominator to 'relax' the result * - perform this weighting a number of times given by the percentage... */ - int iters = (int)ceil(10.0f * pso->percentage); /* TODO: maybe a sensitivity ctrl on top of this is needed */ + /* TODO: maybe a sensitivity ctrl on top of this is needed */ + int iters = (int)ceil(10.0f * pso->percentage); while (iters-- > 0) { (*val) = ( ((sVal * w2) + (eVal * w1)) + ((*val) * 5.0f) ) / 6.0f; @@ -579,7 +596,8 @@ static void pose_slide_apply_quat(tPoseSlideOp *pso, tPChanFCurveLink *pfl) } else { float quat_interp[4], quat_orig[4]; - int iters = (int)ceil(10.0f * pso->percentage); /* TODO: maybe a sensitivity ctrl on top of this is needed */ + /* TODO: maybe a sensitivity ctrl on top of this is needed */ + int iters = (int)ceil(10.0f * pso->percentage); /* perform this blending several times until a satisfactory result is reached */ while (iters-- > 0) { diff --git a/source/blender/editors/armature/pose_transform.c b/source/blender/editors/armature/pose_transform.c index ffbe8b52137..ad4853256e4 100644 --- a/source/blender/editors/armature/pose_transform.c +++ b/source/blender/editors/armature/pose_transform.c @@ -72,7 +72,8 @@ /* ********************************************** */ /* Pose Apply */ -/* helper for apply_armature_pose2bones - fixes parenting of objects that are bone-parented to armature */ +/* helper for apply_armature_pose2bones - fixes parenting of objects + * that are bone-parented to armature */ static void applyarmature_fix_boneparents(const bContext *C, Scene *scene, Object *armob) { Depsgraph *depsgraph = CTX_data_depsgraph(C); @@ -100,7 +101,8 @@ static int apply_armature_pose2bones_exec(bContext *C, wmOperator *op) Main *bmain = CTX_data_main(C); Depsgraph *depsgraph = CTX_data_depsgraph(C); Scene *scene = CTX_data_scene(C); - Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C)); // must be active object, not edit-object + // must be active object, not edit-object + Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C)); const Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); bArmature *arm = BKE_armature_from_object(ob); bPose *pose; @@ -111,7 +113,7 @@ static int apply_armature_pose2bones_exec(bContext *C, wmOperator *op) if (ob->type != OB_ARMATURE) return OPERATOR_CANCELLED; if (BKE_object_obdata_is_libdata(ob)) { - BKE_report(op->reports, RPT_ERROR, "Cannot apply pose to lib-linked armature"); /* error_libdata(); */ + BKE_report(op->reports, RPT_ERROR, "Cannot apply pose to lib-linked armature"); return OPERATOR_CANCELLED; } @@ -745,7 +747,8 @@ static void pchan_clear_rot(bPoseChannel *pchan) } } - /* Clear also Bendy Bone stuff - Roll is obvious, but Curve X/Y stuff is also kindof rotational in nature... */ + /* Clear also Bendy Bone stuff - Roll is obvious, + * but Curve X/Y stuff is also kindof rotational in nature... */ pchan->roll1 = 0.0f; pchan->roll2 = 0.0f; diff --git a/source/blender/editors/armature/pose_utils.c b/source/blender/editors/armature/pose_utils.c index 051940d69ec..90208c40a30 100644 --- a/source/blender/editors/armature/pose_utils.c +++ b/source/blender/editors/armature/pose_utils.c @@ -244,7 +244,8 @@ void poseAnim_mapping_refresh(bContext *C, Scene *scene, Object *ob) else BKE_pose_where_is(depsgraph, scene, ob); - DEG_id_tag_update(&ob->id, ID_RECALC_COPY_ON_WRITE); /* otherwise animation doesn't get updated */ + /* otherwise animation doesn't get updated */ + DEG_id_tag_update(&ob->id, ID_RECALC_COPY_ON_WRITE); WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob); } |