diff options
Diffstat (limited to 'source/blender/editors/armature')
-rw-r--r-- | source/blender/editors/armature/editarmature.c | 19 | ||||
-rw-r--r-- | source/blender/editors/armature/editarmature_retarget.c | 2 | ||||
-rw-r--r-- | source/blender/editors/armature/poseobject.c | 8 | ||||
-rw-r--r-- | source/blender/editors/armature/reeb.c | 4 |
4 files changed, 18 insertions, 15 deletions
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 4090fc1acaa..a09722f78b6 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -395,7 +395,7 @@ void ED_armature_from_edit(Object *obedit) if (fBone->parent==eBone) fBone->parent= eBone->parent; } - if (G.f & G_DEBUG) + if (G.debug & G_DEBUG) printf("Warning: removed zero sized bone: %s\n", eBone->name); bone_free(arm, eBone); } @@ -2933,7 +2933,7 @@ static int armature_fill_bones_exec (bContext *C, wmOperator *op) } else { // FIXME.. figure out a method for multiple bones - BKE_reportf(op->reports, RPT_ERROR, "Too many points selected: %d \n", count); + BKE_reportf(op->reports, RPT_ERROR, "Too many points selected: %d\n", count); BLI_freelistN(&points); return OPERATOR_CANCELLED; } @@ -2976,9 +2976,9 @@ static void bones_merge(Object *obedit, EditBone *start, EditBone *end, EditBone /* check if same bone */ if (start == end) { - if (G.f & G_DEBUG) { - printf("Error: same bone! \n"); - printf("\tstart = %s, end = %s \n", start->name, end->name); + if (G.debug & G_DEBUG) { + printf("Error: same bone!\n"); + printf("\tstart = %s, end = %s\n", start->name, end->name); } } @@ -3055,7 +3055,7 @@ static int armature_merge_exec (bContext *C, wmOperator *op) short type= RNA_enum_get(op->ptr, "type"); /* sanity checks */ - if ELEM(NULL, obedit, arm) + if (ELEM(NULL, obedit, arm)) return OPERATOR_CANCELLED; /* for now, there's only really one type of merging that's performed... */ @@ -4898,7 +4898,7 @@ static int pose_clear_transform_generic_exec(bContext *C, wmOperator *op, short autokey = 0; /* sanity checks */ - if ELEM(NULL, clear_func, default_ksName) { + if (ELEM(NULL, clear_func, default_ksName)) { BKE_report(op->reports, RPT_ERROR, "Programming error: missing clear transform func or Keying Set Name"); return OPERATOR_CANCELLED; } @@ -5393,7 +5393,10 @@ void ED_armature_bone_rename(bArmature *arm, const char *oldnamep, const char *n /* Fix all animdata that may refer to this bone - we can't just do the ones attached to objects, since * other ID-blocks may have drivers referring to this bone [#29822] */ - BKE_all_animdata_fix_paths_rename("pose.bones", oldname, newname); + { + + BKE_all_animdata_fix_paths_rename(&arm->id, "pose.bones", oldname, newname); + } /* correct view locking */ { diff --git a/source/blender/editors/armature/editarmature_retarget.c b/source/blender/editors/armature/editarmature_retarget.c index 261018329ab..f554b7b1c50 100644 --- a/source/blender/editors/armature/editarmature_retarget.c +++ b/source/blender/editors/armature/editarmature_retarget.c @@ -2657,7 +2657,7 @@ static void findCorrespondingArc(RigGraph *rigg, RigArc *start_arc, RigNode *sta if (next_earc->flag == ARC_FREE && next_earc->symmetry_level == symmetry_level) { -// printf("USING: \n"); +// printf("USING:\n"); // printf("flag %i -- level %i -- flag %i -- group %i\n", next_earc->flag, next_earc->symmetry_level, next_earc->symmetry_flag, next_earc->symmetry_group); matchMultiResolutionArc(rigg, start_node, next_iarc, next_earc); break; diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index 3d33930fa49..6768c884868 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -256,7 +256,7 @@ static void ED_pose_clear_paths(Object *ob) bPoseChannel *pchan; short skipped = 0; - if ELEM(NULL, ob, ob->pose) + if (ELEM(NULL, ob, ob->pose)) return; /* free the motionpath blocks, but also take note of whether we skipped some... */ @@ -289,7 +289,7 @@ static int pose_clear_paths_exec (bContext *C, wmOperator *UNUSED(op)) ob= object_pose_armature_get(CTX_data_active_object(C)); /* only continue if there's an object */ - if ELEM(NULL, ob, ob->pose) + if (ELEM(NULL, ob, ob->pose)) return OPERATOR_CANCELLED; /* use the backend function for this */ @@ -1110,7 +1110,7 @@ static int pose_copy_exec (bContext *C, wmOperator *op) Object *ob= object_pose_armature_get(CTX_data_active_object(C)); /* sanity checking */ - if ELEM(NULL, ob, ob->pose) { + if (ELEM(NULL, ob, ob->pose)) { BKE_report(op->reports, RPT_ERROR, "No Pose to Copy"); return OPERATOR_CANCELLED; } @@ -1155,7 +1155,7 @@ static int pose_paste_exec (bContext *C, wmOperator *op) KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, ANIM_KS_LOC_ROT_SCALE_ID); /* sanity checks */ - if ELEM(NULL, ob, ob->pose) + if (ELEM(NULL, ob, ob->pose)) return OPERATOR_CANCELLED; if (g_posebuf == NULL) { diff --git a/source/blender/editors/armature/reeb.c b/source/blender/editors/armature/reeb.c index 30f929c9603..546bcb1f40f 100644 --- a/source/blender/editors/armature/reeb.c +++ b/source/blender/editors/armature/reeb.c @@ -554,12 +554,12 @@ static void verifyBucketsArc(ReebGraph *UNUSED(rg), ReebArc *arc) if (ceilf(head->weight) != arc->buckets[0].val) { printArc(arc); - printf("alloc error in first bucket: %f should be %f \n", arc->buckets[0].val, ceil(head->weight)); + printf("alloc error in first bucket: %f should be %f\n", arc->buckets[0].val, ceil(head->weight)); } if (floorf(tail->weight) != arc->buckets[arc->bcount - 1].val) { printArc(arc); - printf("alloc error in last bucket: %f should be %f \n", arc->buckets[arc->bcount - 1].val, floor(tail->weight)); + printf("alloc error in last bucket: %f should be %f\n", arc->buckets[arc->bcount - 1].val, floor(tail->weight)); } } } |