diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-06-14 16:06:21 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-06-14 16:06:21 +0400 |
| commit | 8ff0c2e10720bd6e583a6b133b75e7bdff27a5f8 (patch) | |
| tree | 9c7e15d27d1b53af6ee9f428c9db7d855f013807 /source/blender/makesdna/DNA_actuator_types.h | |
| parent | 7272bb643c379986c7332a994ce9e576d3b8a748 (diff) | |
| parent | 23e2bfed239256994a6daf2ca5a08298e7029681 (diff) | |
Merge with trunk r37475.
Diffstat (limited to 'source/blender/makesdna/DNA_actuator_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_actuator_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h index 7951ebc8c99..b368aadf4c2 100644 --- a/source/blender/makesdna/DNA_actuator_types.h +++ b/source/blender/makesdna/DNA_actuator_types.h @@ -135,7 +135,7 @@ typedef struct bIpoActuator { typedef struct bCameraActuator { struct Object *ob; float height, min, max; - float pad; + float damping; short pad1, axis; float pad2; } bCameraActuator ; |