Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergej Reich <sergej.reich@googlemail.com>2013-02-06 01:51:18 +0400
committerSergej Reich <sergej.reich@googlemail.com>2013-02-06 01:51:18 +0400
commit83b8cbeab1584581b0601941e2b0581a209bb88b (patch)
treeef890b42da8539345e54c62d4b715e6a6327a9ea /intern/rigidbody/rb_bullet_api.cpp
parentaa02ca126b327c701d5f019d61f00398bcd6c932 (diff)
rigidbody: Code cleanup
Stupid oversight, don't use floats for indices.
Diffstat (limited to 'intern/rigidbody/rb_bullet_api.cpp')
-rw-r--r--intern/rigidbody/rb_bullet_api.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/rigidbody/rb_bullet_api.cpp b/intern/rigidbody/rb_bullet_api.cpp
index 4a3367ad768..58345d4e08c 100644
--- a/intern/rigidbody/rb_bullet_api.cpp
+++ b/intern/rigidbody/rb_bullet_api.cpp
@@ -897,21 +897,21 @@ void RB_constraint_set_limits_piston(rbConstraint *con, float lin_lower, float l
constraint->setUpperAngLimit(ang_upper);
}
-void RB_constraint_set_limits_6dof(rbConstraint *con, float axis, float lower, float upper)
+void RB_constraint_set_limits_6dof(rbConstraint *con, int axis, float lower, float upper)
{
btGeneric6DofConstraint *constraint = reinterpret_cast<btGeneric6DofConstraint*>(con);
constraint->setLimit(axis, lower, upper);
}
-void RB_constraint_set_stiffness_6dof_spring(rbConstraint *con, float axis, float stiffness)
+void RB_constraint_set_stiffness_6dof_spring(rbConstraint *con, int axis, float stiffness)
{
btGeneric6DofSpringConstraint *constraint = reinterpret_cast<btGeneric6DofSpringConstraint*>(con);
constraint->setStiffness(axis, stiffness);
}
-void RB_constraint_set_damping_6dof_spring(rbConstraint *con, float axis, float damping)
+void RB_constraint_set_damping_6dof_spring(rbConstraint *con, int axis, float damping)
{
btGeneric6DofSpringConstraint *constraint = reinterpret_cast<btGeneric6DofSpringConstraint*>(con);
@@ -919,7 +919,7 @@ void RB_constraint_set_damping_6dof_spring(rbConstraint *con, float axis, float
constraint->setDamping(axis, 1.0f - damping);
}
-void RB_constraint_set_spring_6dof_spring(rbConstraint *con, float axis, int enable)
+void RB_constraint_set_spring_6dof_spring(rbConstraint *con, int axis, int enable)
{
btGeneric6DofSpringConstraint *constraint = reinterpret_cast<btGeneric6DofSpringConstraint*>(con);