diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-07 13:24:45 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-07 13:24:45 +0400 |
| commit | f354d44cbad105fc63c64c2cb243c4ceaa8d0ef0 (patch) | |
| tree | 27693de0fbf3df09e3f6403e71c6c587dd19a904 /source/blender/makesdna | |
| parent | a0723afe2016396473fe32801e7b7b9339c9f027 (diff) | |
| parent | 433033c2bf4b72e389d103e00a375d344588ac8e (diff) | |
Merging r42461 through r42481 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index e4237197fca..8707ae038c3 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -219,7 +219,7 @@ typedef struct Object { ListBase controllers; /* game logic controllers */ ListBase actuators; /* game logic actuators */ - float bbsize[3]; + float bbsize[3] DNA_DEPRECATED; short index; /* custom index, for renderpasses */ unsigned short actdef; /* current deformation group, note: index starts at 1 */ float col[4]; /* object color */ |