diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-07-01 16:43:56 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-07-01 16:43:56 +0300 |
| commit | ba1e23bf8494b01f6c2ba173a140d11ae7603603 (patch) | |
| tree | e4ee82ee4bc9ff15e10b084bdc5c5f6cf85e4d6b /source/blender/makesdna/DNA_object_types.h | |
| parent | 6fb00f466765edc93f97d099f88abc66b055f5af (diff) | |
| parent | f525483d837f8f91876ba395134c3ed263dcc7c2 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/blenlib/intern/BLI_filelist.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_snap.c
source/blenderplayer/bad_level_call_stubs/stubs.c
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 0c212a2884c..1d655a1cdce 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -221,6 +221,8 @@ typedef struct Object { float margin; float max_vel; /* clamp the maximum velocity 0.0 is disabled */ float min_vel; /* clamp the minimum velocity 0.0 is disabled */ + float max_angvel; /* clamp the maximum angular velocity, 0.0 is disabled */ + float min_angvel; /* clamp the minimum angular velocity, 0.0 is disabled */ float obstacleRad; /* "Character" physics properties */ |