diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-06-21 05:14:49 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-06-21 05:14:49 +0300 |
commit | 48c58bd9138ad88d8aaa24ad9d6d67e1303e7905 (patch) | |
tree | 4e6b7d88ce3be745406cd83eaf132ae89180bfb0 /source/blender/makesdna | |
parent | 2cfff95ba315c0650b0be4045dd4adc187bbf65b (diff) | |
parent | 1c199401983bd53577cb180efe83ee5314f04296 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_camera_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/intern/dna_genfile.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h index 68741578f27..52e40cbc098 100644 --- a/source/blender/makesdna/DNA_camera_types.h +++ b/source/blender/makesdna/DNA_camera_types.h @@ -85,8 +85,8 @@ typedef struct Camera { char sensor_fit; char pad[7]; - /* Stereo settings */ - struct CameraStereoSettings stereo; + /* Stereo settings */ + struct CameraStereoSettings stereo; } Camera; /* **************** CAMERA ********************* */ diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index 4f19e819625..b8783da73ca 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -1148,7 +1148,7 @@ void DNA_struct_switch_endian(SDNA *oldsdna, int oldSDNAnr, char *data) /* test: is type a struct? */ if (spc[0] >= firststructtypenr && !ispointer(name)) { - /* struct field type */ + /* struct field type */ /* where does the old data start (is there one?) */ cpo = find_elem(oldsdna, type, name, spo, data, NULL); if (cpo) { |