← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/blender/makesdna/DNA_genfile.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/makesdna/DNA_genfile.h
35
35
 
36
36
struct SDNA;
37
37
 
38
 
extern unsigned char DNAstr[];  /* DNA.c */
39
 
extern int DNAlen;
 
38
extern const unsigned char DNAstr[];  /* DNA.c */
 
39
extern const int DNAlen;
40
40
 
41
41
typedef enum eSDNA_Type {
42
42
        SDNA_TYPE_CHAR     = 0,
56
56
/* define so switch statements don't complain */
57
57
#define SDNA_TYPE_VOID 9
58
58
 
59
 
struct SDNA *DNA_sdna_from_data(void *data, int datalen, int do_endian_swap);
 
59
struct SDNA *DNA_sdna_from_data(const void *data, const int datalen, int do_endian_swap);
60
60
void DNA_sdna_free(struct SDNA *sdna);
61
61
 
62
62
int DNA_struct_find_nr(struct SDNA *sdna, const char *str);