diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-12-30 03:53:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-30 03:58:18 +0400 |
| commit | 24c807ffd4b1863f4c66aa5e73a3730c4d78e602 (patch) | |
| tree | a2ebb8b35ee78446bb66d8db08bd8feac0b61d45 /source/blender | |
| parent | 889d77e6f67e8da70a7cd7dcec6eec12bd996d9f (diff) | |
Code Cleanup: unused defines & style
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/rigidbody.c | 8 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/writefile.c | 2 | ||||
| -rw-r--r-- | source/blender/ikplugin/intern/itasc_plugin.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index 271a9a91f95..316885d9e71 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -314,7 +314,7 @@ static rbCollisionShape *rigidbody_get_shape_trimesh_from_mesh(Object *ob) /* init mesh data for collision shape */ mdata = RB_trimesh_data_new(tottris, totvert); - RB_trimesh_add_vertices(mdata, (float*)mvert, totvert, sizeof(MVert)); + RB_trimesh_add_vertices(mdata, (float *)mvert, totvert, sizeof(MVert)); /* loop over all faces, adding them as triangles to the collision shape * (so for some faces, more than triangle will get added) @@ -482,7 +482,7 @@ static void rigidbody_validate_sim_object(RigidBodyWorld *rbw, Object *ob, bool rigidbody_validate_sim_shape(ob, true); if (rbo->physics_object && rebuild == false) { - RB_dworld_remove_body(rbw->physics_world, rbo->physics_object); + RB_dworld_remove_body(rbw->physics_world, rbo->physics_object); } if (!rbo->physics_object || rebuild) { /* remove rigid body if it already exists before creating a new one */ @@ -555,7 +555,7 @@ static void rigidbody_validate_sim_constraint(RigidBodyWorld *rbw, Object *ob, b } if (rbc->physics_constraint && rebuild == false) { - RB_dworld_remove_constraint(rbw->physics_world, rbc->physics_constraint); + RB_dworld_remove_constraint(rbw->physics_world, rbc->physics_constraint); } if (rbc->physics_constraint == NULL || rebuild) { rbRigidBody *rb1 = rbc->ob1->rigidbody_object->physics_object; @@ -1035,7 +1035,7 @@ static void rigidbody_update_sim_ob(Scene *scene, RigidBodyWorld *rbw, Object *o int totvert = dm->getNumVerts(dm); BoundBox *bb = BKE_object_boundbox_get(ob); - RB_shape_trimesh_update(rbo->physics_shape, (float*)mvert, totvert, sizeof(MVert), bb->vec[0], bb->vec[6]); + RB_shape_trimesh_update(rbo->physics_shape, (float *)mvert, totvert, sizeof(MVert), bb->vec[0], bb->vec[6]); } } diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index fd8c711fb1a..9ffe4dae82a 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1474,7 +1474,7 @@ static void write_modifiers(WriteData *wd, ListBase *modbase) if (wmd->cmap_curve) write_curvemapping(wd, wmd->cmap_curve); } - else if(md->type==eModifierType_LaplacianDeform) { + else if (md->type==eModifierType_LaplacianDeform) { LaplacianDeformModifierData *lmd = (LaplacianDeformModifierData*) md; writedata(wd, DATA, sizeof(float)*lmd->total_verts * 3, lmd->vertexco); diff --git a/source/blender/ikplugin/intern/itasc_plugin.cpp b/source/blender/ikplugin/intern/itasc_plugin.cpp index 53597fb9be0..a61cefcff69 100644 --- a/source/blender/ikplugin/intern/itasc_plugin.cpp +++ b/source/blender/ikplugin/intern/itasc_plugin.cpp @@ -71,9 +71,9 @@ extern "C" { bItasc DefIKParam; // in case of animation mode, feedback and timestep is fixed -#define ANIM_TIMESTEP 1.0 +// #define ANIM_TIMESTEP 1.0 #define ANIM_FEEDBACK 0.8 -#define ANIM_QMAX 0.52 +// #define ANIM_QMAX 0.52 // Structure pointed by bPose.ikdata |