diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-23 15:59:50 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-23 15:59:50 +0300 |
| commit | 5f2e5ffd188dcf922d750ab5384652ef7ea95c99 (patch) | |
| tree | 22a74268e08b61e62e748a0d748da1b2c06d34a8 /source/blender/makesdna/DNA_object_types.h | |
| parent | d54f93463f387f9fd6e98f5aa8aa3d4ba06d91ce (diff) | |
| parent | b8a6cd0140cae6d4da1d17577f60dc7b854fdff1 (diff) | |
Merge branch 'master' into gooseberry
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 058b5ea8605..1aafeb0c713 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -117,7 +117,8 @@ typedef struct LodLevel { struct LodLevel *next, *prev; struct Object *source; int flags; - float distance; + float distance, pad; + int obhysteresis; } LodLevel; typedef struct Object { @@ -525,6 +526,7 @@ enum { enum { OB_LOD_USE_MESH = 1 << 0, OB_LOD_USE_MAT = 1 << 1, + OB_LOD_USE_HYST = 1 << 2, }; |