[Bf-blender-cvs] [fbdac74c405] master: Cleanup: move versioning code into "until next bump" block

[Sybren A. Stüvel]

Commit: fbdac74c405e2607b05b28fff8845c9f839590d6
Author: Sybren A. Stüvel
Date:   Tue Sep 15 12:55:44 2020 +0200
Branches: master
https://developer.blender.org/rBfbdac74c405e2607b05b28fff8845c9f839590d6

Cleanup: move versioning code into "until next bump" block

A bit of versioning code was not part of the "Versioning code until next
subversion bump goes here" block, making the diff of an upcoming bump
harder to read. This commit just moves the code to the appropriate spot.

No functional changes.

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

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 7805dbdcefa..c9cb6930da3 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -528,23 +528,6 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
     }
   }
 
-  for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
-    RigidBodyWorld *rbw = scene->rigidbody_world;
-
-    if (rbw == NULL) {
-      continue;
-    }
-
-    /* The substep method changed from "per second" to "per frame".
-     * To get the new value simply divide the old bullet sim fps with the scene fps.
-     */
-    rbw->substeps_per_frame /= FPS;
-
-    if (rbw->substeps_per_frame <= 0) {
-      rbw->substeps_per_frame = 1;
-    }
-  }
-
   /**
    * Versioning code until next subversion bump goes here.
    *
@@ -555,6 +538,23 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
    * \note Keep this message at the bottom of the function.
    */
   {
+    for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
+      RigidBodyWorld *rbw = scene->rigidbody_world;
+
+      if (rbw == NULL) {
+        continue;
+      }
+
+      /* The substep method changed from "per second" to "per frame".
+       * To get the new value simply divide the old bullet sim fps with the scene fps.
+       */
+      rbw->substeps_per_frame /= FPS;
+
+      if (rbw->substeps_per_frame <= 0) {
+        rbw->substeps_per_frame = 1;
+      }
+    }
+
     /* Set the minimum sequence interpolate for grease pencil. */
     if (!DNA_struct_elem_find(fd->filesdna, "GP_Interpolate_Settings", "int", "step")) {
       LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {