diff options
Diffstat (limited to 'source/blender/blenkernel/intern/armature.c')
-rw-r--r-- | source/blender/blenkernel/intern/armature.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 431c24d3ed0..31695b05352 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -233,7 +233,7 @@ static Bone *get_named_bone_bonechildren(Bone *bone, const char *name) { Bone *curBone, *rbone; - if (!strcmp(bone->name, name)) + if (STREQ(bone->name, name)) return bone; for (curBone = bone->childbase.first; curBone; curBone = curBone->next) { @@ -2206,7 +2206,7 @@ static void splineik_evaluate_bone(tSplineIK_Tree *tree, Scene *scene, Object *o float range = bulge_max - 1.0f; float scale = (range > 0.0f) ? 1.0f / range : 0.0f; - float soft = 1.0f + range * atanf((bulge - 1.0f) * scale) / (0.5f * M_PI); + float soft = 1.0f + range * atanf((bulge - 1.0f) * scale) / (float)M_PI_2; bulge = interpf(soft, hard, ikData->bulge_smooth); } @@ -2218,7 +2218,7 @@ static void splineik_evaluate_bone(tSplineIK_Tree *tree, Scene *scene, Object *o float range = 1.0f - bulge_min; float scale = (range > 0.0f) ? 1.0f / range : 0.0f; - float soft = 1.0f - range * atanf((1.0f - bulge) * scale) / (0.5f * M_PI); + float soft = 1.0f - range * atanf((1.0f - bulge) * scale) / (float)M_PI_2; bulge = interpf(soft, hard, ikData->bulge_smooth); } @@ -2417,7 +2417,7 @@ static void do_strip_modifiers(Scene *scene, Object *armob, Bone *bone, bPoseCha /* validate first */ if (amod->ob && amod->ob->type == OB_CURVE && amod->channel[0]) { - if (strcmp(pchan->name, amod->channel) == 0) { + if (STREQ(pchan->name, amod->channel)) { float mat4[4][4], mat3[3][3]; curve_deform_vector(scene, amod->ob, armob, bone->arm_mat[3], pchan->pose_mat[3], mat3, amod->no_rot_axis); @@ -2430,7 +2430,7 @@ static void do_strip_modifiers(Scene *scene, Object *armob, Bone *bone, bPoseCha break; case ACTSTRIP_MOD_NOISE: { - if (strcmp(pchan->name, amod->channel) == 0) { + if (STREQ(pchan->name, amod->channel)) { float nor[3], loc[3], ofs; float eul[3], size[3], eulo[3], sizeo[3]; |