diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-05-13 22:16:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-13 22:16:25 +0400 |
| commit | 2a3fddf5b305c3434d11ab9254bd5605f79f4c3c (patch) | |
| tree | 6a9251e4a030e23f9ebffd9124cf63e9bdbf9094 /source/blender/blenkernel/BKE_main.h | |
| parent | 7444613a9a2ff8433712b2dc0525ee91a44c04a7 (diff) | |
| parent | e5963aae1de14c4aaf2953b1cb91b4119415c565 (diff) | |
svn merge: Merging r46558 through r46612, from trunk
Diffstat (limited to 'source/blender/blenkernel/BKE_main.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_main.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h index 382ce7c1274..3074e1c0e63 100644 --- a/source/blender/blenkernel/BKE_main.h +++ b/source/blender/blenkernel/BKE_main.h @@ -53,7 +53,7 @@ typedef struct Main { char name[1024]; /* 1024 = FILE_MAX */ short versionfile, subversionfile; short minversionfile, minsubversionfile; - int revision; /* svn revision of binary that saved file */ + int revision; /* svn revision of binary that saved file */ struct Library *curlib; ListBase scene; @@ -68,7 +68,7 @@ typedef struct Main { ListBase latt; ListBase lamp; ListBase camera; - ListBase ipo; // XXX depreceated + ListBase ipo; // XXX depreceated ListBase key; ListBase world; ListBase screen; |