diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
| commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
| tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenloader/intern/versioning_dna.c | |
| parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) | |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/blenloader/intern/versioning_dna.c')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_dna.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/blenloader/intern/versioning_dna.c b/source/blender/blenloader/intern/versioning_dna.c index 8032f4c6b51..aee54b94833 100644 --- a/source/blender/blenloader/intern/versioning_dna.c +++ b/source/blender/blenloader/intern/versioning_dna.c @@ -42,21 +42,21 @@ void blo_do_versions_dna(SDNA *sdna, const int versionfile, const int subversionfile) { #define DNA_VERSION_ATLEAST(ver, subver) \ - (versionfile > (ver) || (versionfile == (ver) && (subversionfile >= (subver)))) + (versionfile > (ver) || (versionfile == (ver) && (subversionfile >= (subver)))) - if (!DNA_VERSION_ATLEAST(280, 2)) { - /* Version files created in the 'blender2.8' branch - * between October 2016, and November 2017 (>=280.0 and < 280.2). */ - if (versionfile >= 280) { - DNA_sdna_patch_struct(sdna, "SceneLayer", "ViewLayer"); - DNA_sdna_patch_struct(sdna, "SceneLayerEngineData", "ViewLayerEngineData"); - DNA_sdna_patch_struct_member(sdna, "FileGlobal", "cur_render_layer", "cur_view_layer"); - DNA_sdna_patch_struct_member(sdna, "ParticleEditSettings", "scene_layer", "view_layer"); - DNA_sdna_patch_struct_member(sdna, "Scene", "active_layer", "active_view_layer"); - DNA_sdna_patch_struct_member(sdna, "Scene", "render_layers", "view_layers"); - DNA_sdna_patch_struct_member(sdna, "WorkSpace", "render_layer", "view_layer"); - } - } + if (!DNA_VERSION_ATLEAST(280, 2)) { + /* Version files created in the 'blender2.8' branch + * between October 2016, and November 2017 (>=280.0 and < 280.2). */ + if (versionfile >= 280) { + DNA_sdna_patch_struct(sdna, "SceneLayer", "ViewLayer"); + DNA_sdna_patch_struct(sdna, "SceneLayerEngineData", "ViewLayerEngineData"); + DNA_sdna_patch_struct_member(sdna, "FileGlobal", "cur_render_layer", "cur_view_layer"); + DNA_sdna_patch_struct_member(sdna, "ParticleEditSettings", "scene_layer", "view_layer"); + DNA_sdna_patch_struct_member(sdna, "Scene", "active_layer", "active_view_layer"); + DNA_sdna_patch_struct_member(sdna, "Scene", "render_layers", "view_layers"); + DNA_sdna_patch_struct_member(sdna, "WorkSpace", "render_layer", "view_layer"); + } + } #undef DNA_VERSION_ATLEAST } |