diff options
author | Lukas Stockner <lukas.stockner@freenet.de> | 2017-04-24 23:17:45 +0300 |
---|---|---|
committer | Lukas Stockner <lukas.stockner@freenet.de> | 2017-04-24 23:17:45 +0300 |
commit | 7c0204c6d5739cf202afb5d14c5f7a8a1a0c57a6 (patch) | |
tree | c1eb657ecc3479b911851c52f9cd2d7c288ae223 /source/blender/blenloader | |
parent | e1f5b6bdcb20f5a58b1049761aa07971d2c69346 (diff) | |
parent | d8661ee2d5e76ef012b356eda93ea1a9ed8af325 (diff) |
Merge remote-tracking branch 'origin/master' into temp-cycles-denoising
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/versioning_270.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index 5abbee7e6fc..bfd96582163 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -1259,7 +1259,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main) for (Camera *camera = main->camera.first; camera != NULL; camera = camera->id.next) { if (camera->stereo.pole_merge_angle_from == 0.0f && - camera->stereo.pole_merge_angle_to == 0.0f) + camera->stereo.pole_merge_angle_to == 0.0f) { camera->stereo.pole_merge_angle_from = DEG2RADF(60.0f); camera->stereo.pole_merge_angle_to = DEG2RADF(75.0f); diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 57be237be6f..723b7929667 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1317,8 +1317,8 @@ static void write_particlesettings(WriteData *wd, ParticleSettings *part) dw->index = 0; if (part->dup_group) { /* can be NULL if lining fails or set to None */ for (GroupObject *go = part->dup_group->gobject.first; - go && go->ob != dw->ob; - go = go->next, dw->index++); + go && go->ob != dw->ob; + go = go->next, dw->index++); } } writestruct(wd, DATA, ParticleDupliWeight, 1, dw); @@ -2654,8 +2654,8 @@ static void write_scene(WriteData *wd, Scene *sce) } if (seq->type == SEQ_TYPE_IMAGE) { writestruct(wd, DATA, StripElem, - MEM_allocN_len(strip->stripdata) / sizeof(struct StripElem), - strip->stripdata); + MEM_allocN_len(strip->stripdata) / sizeof(struct StripElem), + strip->stripdata); } else if (ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_SOUND_RAM, SEQ_TYPE_SOUND_HD)) { writestruct(wd, DATA, StripElem, 1, strip->stripdata); @@ -3362,13 +3362,13 @@ static void write_mask(WriteData *wd, Mask *mask) } for (masklay_shape = masklay->splines_shapes.first; - masklay_shape; - masklay_shape = masklay_shape->next) + masklay_shape; + masklay_shape = masklay_shape->next) { writestruct(wd, DATA, MaskLayerShape, 1, masklay_shape); writedata(wd, DATA, - masklay_shape->tot_vert * sizeof(float) * MASK_OBJECT_SHAPE_ELEM_SIZE, - masklay_shape->data); + masklay_shape->tot_vert * sizeof(float) * MASK_OBJECT_SHAPE_ELEM_SIZE, + masklay_shape->data); } } } @@ -3854,7 +3854,7 @@ static bool write_file_handle( write_scene(wd, (Scene *)id); break; case ID_CU: - write_curve(wd,(Curve *)id); + write_curve(wd, (Curve *)id); break; case ID_MB: write_mball(wd, (MetaBall *)id); |