← Back to branch summary

~ubuntu-branches/ubuntu/saucy/blender/saucy-proposed

« back to all changes in this revision

Viewing changes to source/blender/blenkernel/BKE_main.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/blenkernel/BKE_main.h
51
51
typedef struct Main {
52
52
        struct Main *next, *prev;
53
53
        char name[1024]; /* 1024 = FILE_MAX */
54
 
        short versionfile, subversionfile;
 
54
        short versionfile, subversionfile;  /* see BLENDER_VERSION, BLENDER_SUBVERSION */
55
55
        short minversionfile, minsubversionfile;
56
 
        int revision;   /* svn revision of binary that saved file */
 
56
        int revision;           /* svn revision of binary that saved file */
 
57
        short recovered;        /* indicate the main->name (file) is the recovered one */
57
58
        
58
59
        struct Library *curlib;
59
60
        ListBase scene;
68
69
        ListBase latt;
69
70
        ListBase lamp;
70
71
        ListBase camera;
71
 
        ListBase ipo;   // XXX depreceated
 
72
        ListBase ipo;   // XXX deprecated
72
73
        ListBase key;
73
74
        ListBase world;
74
75
        ListBase screen;
86
87
        ListBase wm;
87
88
        ListBase gpencil;
88
89
        ListBase movieclip;
 
90
        ListBase mask;
89
91
 
90
92
        char id_tag_update[256];
91
93
} Main;
92
94
 
 
95
#define MAIN_VERSION_ATLEAST(main, ver, subver) \
 
96
        ((main)->versionfile > (ver) || (main->versionfile == (ver) && (main)->subversionfile >= (subver)))
93
97
 
94
98
#ifdef __cplusplus
95
99
}
96
100
#endif
97
101
 
98
 
#endif
99
 
 
 
102
#endif  /* __BKE_MAIN_H__ */