diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-11-07 17:46:27 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-11-07 17:46:27 +0300 |
| commit | c1ba58c44dd771770037707cd06eb312e015280f (patch) | |
| tree | f1a58e6c8a133f6482e9b5eff73ef90bc759de90 /source/blender/makesdna/DNA_rigidbody_types.h | |
| parent | 93dbd81796df663598df26119e1e1a5c595be840 (diff) | |
| parent | e74e622776a53e4ab5696d4b6fd17638dc2e9210 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/blender/addon/properties.py
Diffstat (limited to 'source/blender/makesdna/DNA_rigidbody_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_rigidbody_types.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_rigidbody_types.h b/source/blender/makesdna/DNA_rigidbody_types.h index 934028f2e5f..72805c7acb4 100644 --- a/source/blender/makesdna/DNA_rigidbody_types.h +++ b/source/blender/makesdna/DNA_rigidbody_types.h @@ -223,10 +223,16 @@ typedef struct RigidBodyCon { float spring_stiffness_x; float spring_stiffness_y; float spring_stiffness_z; + float spring_stiffness_ang_x; + float spring_stiffness_ang_y; + float spring_stiffness_ang_z; /* amount of velocity lost over time */ float spring_damping_x; float spring_damping_y; float spring_damping_z; + float spring_damping_ang_x; + float spring_damping_ang_y; + float spring_damping_ang_z; /* motor settings */ float motor_lin_target_velocity; /* linear velocity the motor tries to hold */ @@ -292,7 +298,11 @@ typedef enum eRigidBodyCon_Flag { RBC_FLAG_USE_SPRING_Z = (1 << 13), /* motors */ RBC_FLAG_USE_MOTOR_LIN = (1 << 14), - RBC_FLAG_USE_MOTOR_ANG = (1 << 15) + RBC_FLAG_USE_MOTOR_ANG = (1 << 15), + /* angular springs */ + RBC_FLAG_USE_SPRING_ANG_X = (1 << 16), + RBC_FLAG_USE_SPRING_ANG_Y = (1 << 17), + RBC_FLAG_USE_SPRING_ANG_Z = (1 << 18) } eRigidBodyCon_Flag; /* ******************************** */ |