diff options
Diffstat (limited to 'source/blender/blenkernel/intern/rigidbody.c')
-rw-r--r-- | source/blender/blenkernel/intern/rigidbody.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index 3d61b0bdefb..3bf5c4cc47e 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -62,8 +62,6 @@ #include "BKE_pointcache.h" #include "BKE_rigidbody.h" -#include "RNA_access.h" - #ifdef WITH_BULLET /* ************************************** */ @@ -401,7 +399,7 @@ static void rigidbody_validate_sim_shape(Object *ob, bool rebuild) height = size[2]; } else if (rbo->shape == RB_SHAPE_SPHERE) { - /* take radius to the the largest dimension to try and encompass everything */ + /* take radius to the largest dimension to try and encompass everything */ radius = MAX3(size[0], size[1], size[2]); } @@ -483,7 +481,7 @@ void BKE_rigidbody_calc_volume(Object *ob, float *r_vol) height = size[2]; } else if (rbo->shape == RB_SHAPE_SPHERE) { - /* take radius to the the largest dimension to try and encompass everything */ + /* take radius to the largest dimension to try and encompass everything */ radius = max_fff(size[0], size[1], size[2]) * 0.5f; } @@ -1158,7 +1156,7 @@ static void rigidbody_update_ob_array(RigidBodyWorld *rbw) GroupObject *go; int i, n; - n = BLI_countlist(&rbw->group->gobject); + n = BLI_listbase_count(&rbw->group->gobject); if (rbw->numbodies != n) { rbw->numbodies = n; @@ -1499,7 +1497,7 @@ void BKE_rigidbody_rebuild_world(Scene *scene, float ctime) cache = rbw->pointcache; /* flag cache as outdated if we don't have a world or number of objects in the simulation has changed */ - if (rbw->physics_world == NULL || rbw->numbodies != BLI_countlist(&rbw->group->gobject)) { + if (rbw->physics_world == NULL || rbw->numbodies != BLI_listbase_count(&rbw->group->gobject)) { cache->flag |= PTCACHE_OUTDATED; } |