diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-10-29 05:09:12 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-10-29 05:09:12 +0400 |
| commit | 15ed8343437c6b304de72cd14591455da1d5b3ec (patch) | |
| tree | cbe40f76668f5e8539744c4d2f8aeaa0ded72f52 /source/blender/makesdna/intern | |
| parent | 5acd5d14970c829c2873623716a67beeb6da5278 (diff) | |
| parent | dd106b5c7a129e00bebe121c4da8cb90a16d48cb (diff) | |
Merged changes in the trunk up to revision 51718.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_scene.c
release/datafiles/startup.blend
Diffstat (limited to 'source/blender/makesdna/intern')
| -rw-r--r-- | source/blender/makesdna/intern/dna_genfile.c | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index f5cf7e3ea3b..10c3b0bbee4 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -62,7 +62,7 @@ typedef long long __int64; * - if you want a struct not to be in DNA file: add two hash marks above it (#<enter>#<enter>) * * Structure DNA data is added to each blender file and to each executable, this to detect - * in .blend files new veriables in structs, changed array sizes, etc. It's also used for + * in .blend files new variables in structs, changed array sizes, etc. It's also used for * converting endian and pointer size (32-64 bits) * As an extra, Python uses a call to detect run-time the contents of a blender struct. * @@ -506,7 +506,7 @@ static void init_structDNA(SDNA *sdna, int do_endian_swap) } } -SDNA *DNA_sdna_from_data(void *data, int datalen, int do_endian_swap) +SDNA *DNA_sdna_from_data(const void *data, const int datalen, int do_endian_swap) { SDNA *sdna = MEM_mallocN(sizeof(*sdna), "sdna"); diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 24457f557b0..188c11911b1 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -87,14 +87,14 @@ static const char *includefiles[] = { "DNA_mesh_types.h", "DNA_meshdata_types.h", "DNA_modifier_types.h", - "DNA_lattice_types.h", + "DNA_lattice_types.h", "DNA_object_types.h", "DNA_object_force.h", "DNA_object_fluidsim.h", "DNA_world_types.h", "DNA_scene_types.h", "DNA_view3d_types.h", - "DNA_view2d_types.h", + "DNA_view2d_types.h", "DNA_space_types.h", "DNA_userdef_types.h", "DNA_screen_types.h", @@ -1176,7 +1176,7 @@ int main(int argc, char **argv) strcpy(baseDirectory, BASE_HEADER); } - fprintf(file, "unsigned char DNAstr[]= {\n"); + fprintf(file, "const unsigned char DNAstr[] = {\n"); if (make_structDNA(baseDirectory, file)) { /* error */ fclose(file); @@ -1185,7 +1185,7 @@ int main(int argc, char **argv) } else { fprintf(file, "};\n"); - fprintf(file, "int DNAlen = sizeof(DNAstr);\n"); + fprintf(file, "const int DNAlen = sizeof(DNAstr);\n"); fclose(file); } @@ -1197,7 +1197,7 @@ int main(int argc, char **argv) } /* handy but fails on struct bounds which makesdna doesnt care about - * unless structs are nested */ + * with quite the same strictness as GCC does */ #if 0 /* include files for automatic dependencies */ |