diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-05-12 23:10:49 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-05-12 23:10:49 +0300 |
commit | e4cd4c383f13eb9705d9f5d3536c0b2b72e727bd (patch) | |
tree | a96e9ad9cc93b360e4e0d04145508c7ad4c577fc /source/blender/blenkernel | |
parent | 3160740421cfef1cee61478baadddd256af2dfca (diff) |
Cleanup: style
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_armature.h | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/armature.c | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/armature_update.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/curve.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/depsgraph.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object_update.c | 4 |
6 files changed, 18 insertions, 14 deletions
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h index 5bdf360ded2..a834a83ca00 100644 --- a/source/blender/blenkernel/BKE_armature.h +++ b/source/blender/blenkernel/BKE_armature.h @@ -148,10 +148,12 @@ struct bPose; struct bSplineIKConstraint; struct EvaluationContext; -struct bPoseChannel *BKE_armature_ik_solver_find_root(struct bPoseChannel *pchan, - struct bKinematicConstraint *data); -struct bPoseChannel* BKE_armature_splineik_solver_find_root(struct bPoseChannel *pchan, - struct bSplineIKConstraint *data); +struct bPoseChannel *BKE_armature_ik_solver_find_root( + struct bPoseChannel *pchan, + struct bKinematicConstraint *data); +struct bPoseChannel *BKE_armature_splineik_solver_find_root( + struct bPoseChannel *pchan, + struct bSplineIKConstraint *data); void BKE_pose_splineik_init_tree(struct Scene *scene, struct Object *ob, float ctime); void BKE_splineik_execute_tree(struct Scene *scene, struct Object *ob, struct bPoseChannel *pchan_root, float ctime); diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 498609e62ea..27d3d1c50fb 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -2221,8 +2221,9 @@ BoundBox *BKE_armature_boundbox_get(Object *ob) /************** Graph evaluation ********************/ -bPoseChannel *BKE_armature_ik_solver_find_root(bPoseChannel *pchan, - bKinematicConstraint *data) +bPoseChannel *BKE_armature_ik_solver_find_root( + bPoseChannel *pchan, + bKinematicConstraint *data) { bPoseChannel *rootchan = pchan; if (!(data->flag & CONSTRAINT_IK_TIP)) { @@ -2243,8 +2244,9 @@ bPoseChannel *BKE_armature_ik_solver_find_root(bPoseChannel *pchan, return rootchan; } -bPoseChannel* BKE_armature_splineik_solver_find_root(bPoseChannel *pchan, - bSplineIKConstraint *data) +bPoseChannel *BKE_armature_splineik_solver_find_root( + bPoseChannel *pchan, + bSplineIKConstraint *data) { bPoseChannel *rootchan = pchan; int segcount = 0; diff --git a/source/blender/blenkernel/intern/armature_update.c b/source/blender/blenkernel/intern/armature_update.c index aa36036ed6a..ceda9f056bb 100644 --- a/source/blender/blenkernel/intern/armature_update.c +++ b/source/blender/blenkernel/intern/armature_update.c @@ -629,7 +629,7 @@ void BKE_pose_constraints_evaluate(EvaluationContext *UNUSED(eval_ctx), Object *ob, bPoseChannel *pchan) { - Scene *scene = (Scene*)G.main->scene.first; + Scene *scene = G.main->scene.first; DEBUG_PRINT("%s on %s pchan %s\n", __func__, ob->id.name, pchan->name); if (pchan->flag & POSE_IKTREE || pchan->flag & POSE_IKSPLINE) { /* IK are being solved separately/ */ diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index c95b0055683..c01b3431d09 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -1394,7 +1394,7 @@ void BKE_curve_forward_diff_tangent_bezier(float q0, float q1, float q2, float q rt0 = 3.0f * (q1 - q0); rt1 = f * (3.0f * (q3 - q0) + 9.0f * (q1 - q2)); - rt2 = 6.0f * (q0 + q2)- 12.0f * q1; + rt2 = 6.0f * (q0 + q2) - 12.0f * q1; q0 = rt0; q1 = f * (rt1 + rt2); diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index 9ee9f3d57af..2fd53045e29 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -3235,7 +3235,7 @@ short DAG_get_eval_flags_for_object(Scene *scene, void *object) DagNode *node; if (!DEG_depsgraph_use_legacy()) { - return DEG_get_eval_flags_for_id(scene->depsgraph, (ID*)object); + return DEG_get_eval_flags_for_id(scene->depsgraph, (ID *)object); } if (scene->theDag == NULL) { @@ -3541,7 +3541,7 @@ void DAG_ids_clear_recalc(Main *bmain) short DAG_get_eval_flags_for_object(Scene *scene, void *object) { - return DEG_get_eval_flags_for_id(scene->depsgraph, (ID*)object); + return DEG_get_eval_flags_for_id(scene->depsgraph, (ID *)object); } void DAG_ids_flush_tagged(Main *bmain) diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index 972a93b4a35..46d68e7ccab 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -322,7 +322,7 @@ void BKE_object_eval_uber_transform(EvaluationContext *UNUSED(eval_ctx), copy_m4_m4(ob->obmat, ob->proxy_from->obmat); } - ob->recalc &= ~(OB_RECALC_OB|OB_RECALC_TIME); + ob->recalc &= ~(OB_RECALC_OB | OB_RECALC_TIME); if (ob->data == NULL) { ob->recalc &= ~OB_RECALC_DATA; } @@ -336,5 +336,5 @@ void BKE_object_eval_uber_data(EvaluationContext *eval_ctx, BLI_assert(ob->type != OB_ARMATURE); BKE_object_handle_data_update(eval_ctx, scene, ob); - ob->recalc &= ~(OB_RECALC_DATA|OB_RECALC_TIME); + ob->recalc &= ~(OB_RECALC_DATA | OB_RECALC_TIME); } |