[Bf-blender-cvs] [9c0dea213ed] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 9c0dea213ed55b7a66d454bf16de8a7d6855a596
Author: Bastien Montagne
Date:   Wed Jul 25 21:12:04 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB9c0dea213ed55b7a66d454bf16de8a7d6855a596

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/intern/rigidbody.c

===================================================================



===================================================================

diff --cc source/blender/blenkernel/intern/rigidbody.c
index 59847b28785,5d6695e6598..e6b8312734f
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@@ -716,8 -700,36 +716,37 @@@ static void rigidbody_validate_sim_obje
  
  /* --------------------- */
  
+ static void rigidbody_constraint_init_spring(
+ 	RigidBodyCon *rbc, void (*set_spring)(rbConstraint*,int,int),
+ 	void (*set_stiffness)(rbConstraint*,int,float), void (*set_damping)(rbConstraint*,int,float)
+ ) {
+ 	set_spring(rbc->physics_constraint, RB_LIMIT_LIN_X, rbc->flag & RBC_FLAG_USE_SPRING_X);
+ 	set_stiffness(rbc->physics_constraint, RB_LIMIT_LIN_X, rbc->spring_stiffness_x);
+ 	set_damping(rbc->physics_constraint, RB_LIMIT_LIN_X, rbc->spring_damping_x);
+ 
+ 	set_spring(rbc->physics_constraint, RB_LIMIT_LIN_Y, rbc->flag & RBC_FLAG_USE_SPRING_Y);
+ 	set_stiffness(rbc->physics_constraint, RB_LIMIT_LIN_Y, rbc->spring_stiffness_y);
+ 	set_damping(rbc->physics_constraint, RB_LIMIT_LIN_Y, rbc->spring_damping_y);
+ 
+ 	set_spring(rbc->physics_constraint, RB_LIMIT_LIN_Z, rbc->flag & RBC_FLAG_USE_SPRING_Z);
+ 	set_stiffness(rbc->physics_constraint, RB_LIMIT_LIN_Z, rbc->spring_stiffness_z);
+ 	set_damping(rbc->physics_constraint, RB_LIMIT_LIN_Z, rbc->spring_damping_z);
+ 
+ 	set_spring(rbc->physics_constraint, RB_LIMIT_ANG_X, rbc->flag & RBC_FLAG_USE_SPRING_ANG_X);
+ 	set_stiffness(rbc->physics_constraint, RB_LIMIT_ANG_X, rbc->spring_stiffness_ang_x);
+ 	set_damping(rbc->physics_constraint, RB_LIMIT_ANG_X, rbc->spring_damping_ang_x);
+ 
+ 	set_spring(rbc->physics_constraint, RB_LIMIT_ANG_Y, rbc->flag & RBC_FLAG_USE_SPRING_ANG_Y);
+ 	set_stiffness(rbc->physics_constraint, RB_LIMIT_ANG_Y, rbc->spring_stiffness_ang_y);
+ 	set_damping(rbc->physics_constraint, RB_LIMIT_ANG_Y, rbc->spring_damping_ang_y);
+ 
+ 	set_spring(rbc->physics_constraint, RB_LIMIT_ANG_Z, rbc->flag & RBC_FLAG_USE_SPRING_ANG_Z);
+ 	set_stiffness(rbc->physics_constraint, RB_LIMIT_ANG_Z, rbc->spring_stiffness_ang_z);
+ 	set_damping(rbc->physics_constraint, RB_LIMIT_ANG_Z, rbc->spring_damping_ang_z);
+ }
+ 
 -static void rigidbody_constraint_set_limits(RigidBodyCon *rbc, void (*set_limits)(rbConstraint*,int,float,float))
 +static void rigidbody_constraint_set_limits(
 +        RigidBodyCon *rbc, void (*set_limits)(rbConstraint *, int, float, float))
  {
  	if (rbc->flag & RBC_FLAG_USE_LIMIT_LIN_X)
  		set_limits(rbc->physics_constraint, RB_LIMIT_LIN_X, rbc->limit_lin_x_lower, rbc->limit_lin_x_upper);