Commit: 1d880e8e0bbf885d113e9629a3e9ad0796dfebe8
Author: Martin Felke
Date: Sat Jun 23 16:21:43 2018 +0200
Branches: fracture_modifier
https://developer.blender.org/rB1d880e8e0bbf885d113e9629a3e9ad0796dfebe8
enable angular limit/stiffness/damping settings for plastic constraints
in fact, only forgot to uncomment
===================================================================
M source/blender/blenkernel/intern/rigidbody.c
===================================================================
diff --git a/source/blender/blenkernel/intern/rigidbody.c
b/source/blender/blenkernel/intern/rigidbody.c
index 2715682d9ae..468f6ce3151 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -3759,7 +3759,6 @@ static void
rigidbody_set_springs_active(RigidBodyShardCon *rbc, bool active)
RB_constraint_set_stiffness_6dof_spring(rbc->physics_constraint,
RB_LIMIT_LIN_Z, rbc->spring_stiffness_z);
RB_constraint_set_damping_6dof_spring(rbc->physics_constraint, RB_LIMIT_LIN_Z,
rbc->spring_damping_z);
-#if 0
RB_constraint_set_spring_6dof_spring(rbc->physics_constraint, RB_LIMIT_ANG_X,
rbc->flag & RBC_FLAG_USE_SPRING_ANG_X);
RB_constraint_set_stiffness_6dof_spring(rbc->physics_constraint,
RB_LIMIT_ANG_X, rbc->spring_stiffness_ang_x);
RB_constraint_set_damping_6dof_spring(rbc->physics_constraint, RB_LIMIT_ANG_X,
rbc->spring_damping_ang_x);
@@ -3771,7 +3770,6 @@ static void
rigidbody_set_springs_active(RigidBodyShardCon *rbc, bool active)
RB_constraint_set_spring_6dof_spring(rbc->physics_constraint, RB_LIMIT_ANG_Z,
rbc->flag & RBC_FLAG_USE_SPRING_ANG_Z);
RB_constraint_set_stiffness_6dof_spring(rbc->physics_constraint,
RB_LIMIT_ANG_Z, rbc->spring_stiffness_ang_z);
RB_constraint_set_damping_6dof_spring(rbc->physics_constraint, RB_LIMIT_ANG_Z,
rbc->spring_damping_ang_z);
-#endif
}
else
{
@@ -3787,7 +3785,6 @@ static void
rigidbody_set_springs_active(RigidBodyShardCon *rbc, bool active)
RB_constraint_set_stiffness_6dof_spring(rbc->physics_constraint,
RB_LIMIT_LIN_Z, 0);
RB_constraint_set_damping_6dof_spring(rbc->physics_constraint, RB_LIMIT_LIN_Z,
rbc->spring_damping_z);
-#if 0
RB_constraint_set_spring_6dof_spring(rbc->physics_constraint, RB_LIMIT_ANG_X,
rbc->flag & RBC_FLAG_USE_SPRING_ANG_X);
RB_constraint_set_stiffness_6dof_spring(rbc->physics_constraint,
RB_LIMIT_ANG_X, 0);
RB_constraint_set_damping_6dof_spring(rbc->physics_constraint, RB_LIMIT_ANG_X,
rbc->spring_damping_ang_x);
@@ -3799,7 +3796,6 @@ static void
rigidbody_set_springs_active(RigidBodyShardCon *rbc, bool active)
RB_constraint_set_spring_6dof_spring(rbc->physics_constraint, RB_LIMIT_ANG_Z,
rbc->flag & RBC_FLAG_USE_SPRING_ANG_Z);
RB_constraint_set_stiffness_6dof_spring(rbc->physics_constraint,
RB_LIMIT_ANG_Z, 0);
RB_constraint_set_damping_6dof_spring(rbc->physics_constraint, RB_LIMIT_ANG_Z,
rbc->spring_damping_ang_z);
-#endif
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
