← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/blender/makesdna/DNA_sdna_types.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_sdna_types.h
48
48
        short *typelens;        /* type lengths */
49
49
 
50
50
        int nr_structs;         /* number of struct types */
51
 
        short **structs;        /* sp = structs[a] is the address of a struct definintion
 
51
        short **structs;        /* sp = structs[a] is the address of a struct definition
52
52
                             * sp[0] is struct type number, sp[1] amount of members
53
53
                             *
54
54
                             * (sp[2], sp[3]), (sp[4], sp[5]), .. are the member
81
81
#
82
82
typedef struct BHead8 {
83
83
        int code, len;
84
 
#if defined(WIN32) && !defined(FREE_WINDOWS)
85
 
        /* This is a compiler type! */
86
 
        __int64 old;
87
 
#else
88
 
        long long old;
89
 
#endif  
 
84
        int64_t old;
90
85
        int SDNAnr, nr;
91
86
} BHead8;
92
87