diff options
| author | Jason Hays <jason_hays22@mymail.eku.edu> | 2011-06-27 21:21:08 +0400 |
|---|---|---|
| committer | Jason Hays <jason_hays22@mymail.eku.edu> | 2011-06-27 21:21:08 +0400 |
| commit | 84ea89e25feaeff8eeaf5ebe35c0a76203670569 (patch) | |
| tree | b85158536330b76a9b7445028e04a06d7579ea09 /source/blender/makesdna/DNA_object_types.h | |
| parent | 1876b592daffb86a60890b9f8db55d676d7cae1c (diff) | |
| parent | 8e90ba3b201f58496b3bec39d98963ab77182736 (diff) | |
Merged from trunk with revision range 36835-37865,
(No conflicts had to be manually resolved)
Gave weight paint a basic ability to draw edges and vertices with an option
(with colors for selected/unselected),
but I didn't make any vertex selection functions available in weight paint mode yet
(tested with edit mode for now).
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 6938e3bc311..b1b3e779824 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -252,12 +252,11 @@ typedef struct Object { struct FluidsimSettings *fluidsimSettings; /* if fluidsim enabled, store additional settings */ struct DerivedMesh *derivedDeform, *derivedFinal; - int lastDataMask; /* the custom data layer mask that was last used to calculate derivedDeform and derivedFinal */ + unsigned int lastDataMask; /* the custom data layer mask that was last used to calculate derivedDeform and derivedFinal */ + unsigned int customdata_mask; /* (extra) custom data layer mask to use for creating derivedmesh, set by depsgraph */ unsigned int state; /* bit masks of game controllers that are active */ unsigned int init_state; /* bit masks of initial state as recorded by the users */ - int pad2; - ListBase gpulamp; /* runtime, for lamps only */ ListBase pc_ids; ListBase *duplilist; /* for temporary dupli list storage, only for use by RNA API */ @@ -293,10 +292,6 @@ typedef struct DupliObject { float orco[3], uv[2]; } DupliObject; -/* this work object is defined in object.c */ -extern Object workob; - - /* **************** OBJECT ********************* */ /* used many places... should be specialized */ |