diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-04 21:51:17 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-04 21:51:17 +0300 |
| commit | 4f64596916f8af9883782c4124ea0da72249f724 (patch) | |
| tree | 21350f40952039d6faac5f25e8f8f8d8413f5d49 /source/blender/makesdna/DNA_object_types.h | |
| parent | fa147804b86cdd860491f4ec1b0b5a401b596f79 (diff) | |
| parent | 2cbe60b47672acd67b6ec2c15f13f196247ecfe3 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/makesdna/DNA_object_types.h
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index e45ba79a9b4..10e59618aa0 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -252,7 +252,11 @@ typedef struct Object { short index; /* custom index, for renderpasses */ unsigned short actdef; /* current deformation group, note: index starts at 1 */ unsigned short actfmap; /* current face map, note: index starts at 1 */ - unsigned short pad2[3]; + unsigned short pad2[2]; + + /* did last modifier stack generation need mapping support? */ + short lastNeedMapping; + float col[4]; /* object color */ int gameflag; |