diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-08-11 07:36:35 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-08-11 07:36:35 +0400 |
commit | eedc3834fe3736d68d35dee8c744ce2396e3f6b6 (patch) | |
tree | 0a060ceb053554442de606191ad6c0657bd2f7d3 /source/blender | |
parent | e233be5157641b257afdf05fd3e9cc45949d38cd (diff) |
Comments
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenlib/intern/BLI_ghash.c | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c index b209e6803f8..1227623be94 100644 --- a/source/blender/blenlib/intern/BLI_ghash.c +++ b/source/blender/blenlib/intern/BLI_ghash.c @@ -399,7 +399,7 @@ void *BLI_ghash_lookup_default(GHash *gh, const void *key, void *val_default) * \param key The key to lookup. * \returns the pointer to value for \a key or NULL. * - * \note This has 2 main benifits over #BLI_ghash_lookup. + * \note This has 2 main benefits over #BLI_ghash_lookup. * - A NULL return always means that \a key isn't in \a gh. * - The value can be modified in-place without further function calls (faster). */ diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index e576cbc018f..0bcc6bfd70e 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -127,7 +127,7 @@ typedef struct Object { struct Object *proxy, *proxy_group, *proxy_from; struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */ /* struct Path *path; */ - struct BoundBox *bb; + struct BoundBox *bb; /* axis aligned boundbox (in localspace) */ struct bAction *action DNA_DEPRECATED; // XXX deprecated... old animation system struct bAction *poselib; struct bPose *pose; /* pose data, armature objects only */ @@ -188,6 +188,7 @@ typedef struct Object { char scavisflag; /* more display settings for game logic */ char depsflag; + /* dupli-frame settings */ int dupon, dupoff, dupsta, dupend; int pad; |