[Bf-blender-cvs] [b4017ccb649] master: Cleanup: keep comment block at bottom of versioning

Campbell Barton noreply at git.blender.org
Wed Oct 21 14:38:02 CEST 2020


Commit: b4017ccb649c63e1b0d74b54f81557fbaf7e54aa
Author: Campbell Barton
Date:   Wed Oct 21 17:37:40 2020 +1100
Branches: master
https://developer.blender.org/rBb4017ccb649c63e1b0d74b54f81557fbaf7e54aa

Cleanup: keep comment block at bottom of versioning

The intention of this block is to have all logic that will
be wrapped in a version check next subversion bump.

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

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 8622264188a..2daa1d48f47 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -896,30 +896,30 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
    */
   {
     /* Keep this block, even when empty. */
-  }
 
-  /* Remove options of legacy UV/Image editor */
-  for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
-    LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
-      LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
-        switch (sl->spacetype) {
-          case SPACE_IMAGE: {
-            SpaceImage *sima = (SpaceImage *)sl;
-            sima->flag &= ~(SI_FLAG_UNUSED_20);
-            break;
+    /* Remove options of legacy UV/Image editor */
+    for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
+      LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
+        LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
+          switch (sl->spacetype) {
+            case SPACE_IMAGE: {
+              SpaceImage *sima = (SpaceImage *)sl;
+              sima->flag &= ~(SI_FLAG_UNUSED_20);
+              break;
+            }
           }
         }
       }
     }
-  }
 
-  if (!DNA_struct_elem_find(fd->filesdna, "FluidModifierData", "float", "fractions_distance")) {
-    LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
-      LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) {
-        if (md->type == eModifierType_Fluid) {
-          FluidModifierData *fmd = (FluidModifierData *)md;
-          if (fmd->domain) {
-            fmd->domain->fractions_distance = 0.5;
+    if (!DNA_struct_elem_find(fd->filesdna, "FluidModifierData", "float", "fractions_distance")) {
+      LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
+        LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) {
+          if (md->type == eModifierType_Fluid) {
+            FluidModifierData *fmd = (FluidModifierData *)md;
+            if (fmd->domain) {
+              fmd->domain->fractions_distance = 0.5;
+            }
           }
         }
       }



More information about the Bf-blender-cvs mailing list