diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-06-04 01:11:10 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-06-04 01:11:10 +0400 |
| commit | 329b05dcd789bd8421661898697ed060c83b3286 (patch) | |
| tree | 3d664826fefbe62078c878baab174e066eb48afa /source/blender/makesdna/DNA_scene_types.h | |
| parent | eabf741a8d76aa9400a071c37227504378fc6315 (diff) | |
| parent | f9856c1c2da8139651eb59ff3bf174065d0f628c (diff) | |
Merged changes in the trunk up to revision 47381.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index f57e0a0f0da..5cdd3fbd183 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -634,6 +634,7 @@ typedef struct GameData { short ticrate, maxlogicstep, physubstep, maxphystep; short obstacleSimulation, pad1; float levelHeight; + float deactivationtime, lineardeactthreshold, angulardeactthreshold,pad2; } GameData; #define STEREO_NOSTEREO 1 |