[Bf-blender-cvs] [9bf1bf599b4] master: Cleanup: Missing parentheses around macro in versioning

Julian Eisel noreply at git.blender.org
Mon Oct 19 15:39:13 CEST 2020


Commit: 9bf1bf599b46fe020cf1ae660a2fe4946146ecbd
Author: Julian Eisel
Date:   Mon Oct 19 15:33:09 2020 +0200
Branches: master
https://developer.blender.org/rB9bf1bf599b46fe020cf1ae660a2fe4946146ecbd

Cleanup: Missing parentheses around macro in versioning

Although the `ELEM` macro wraps logic into parentheses, it's not intended to be
used that way. Unexpanded macros should still follow regular coding style for
readability and for tools parsing the code (it confused clang-format for
example).

===================================================================

M	source/blender/blenloader/intern/versioning_290.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c
index 5e6fdad8509..58dcce72823 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -858,7 +858,8 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
 
     /* Ensure that particle systems generated by fluid modifier have correct phystype. */
     LISTBASE_FOREACH (ParticleSettings *, part, &bmain->particles) {
-      if ELEM (part->type, PART_FLUID_FLIP, PART_FLUID_SPRAY, PART_FLUID_BUBBLE, PART_FLUID_FOAM) {
+      if (ELEM(
+              part->type, PART_FLUID_FLIP, PART_FLUID_SPRAY, PART_FLUID_BUBBLE, PART_FLUID_FOAM)) {
         part->phystype = PART_PHYS_NO;
       }
     }
@@ -876,4 +877,4 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
   {
     /* Keep this block, even when empty. */
   }
-}
\ No newline at end of file
+}



More information about the Bf-blender-cvs mailing list