[Bf-blender-cvs] [1a4fc6dcd67] master: Fix versioning code after FCurves versioning not executed

Julian Eisel noreply at git.blender.org
Wed Sep 16 15:57:02 CEST 2020


Commit: 1a4fc6dcd67b3ad4a7490ba9db02881b3edb6263
Author: Julian Eisel
Date:   Wed Sep 16 15:51:44 2020 +0200
Branches: master
https://developer.blender.org/rB1a4fc6dcd67b3ad4a7490ba9db02881b3edb6263

Fix versioning code after FCurves versioning not executed

There must not be any return directly in our versioning patches. It
would return from the entire versioning function.
Mistake in da95d1d851b4.

As a result, when opening old files with animation data, the versioning
for the new collection color tagging wouldn't run, and all collections
would get the first color assigned.

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

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 7f2b1714245..8a5f77fac1d 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -646,7 +646,7 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
       for (FCurve *fcu = act->curves.first; fcu; fcu = fcu->next) {
         /* Only need to fix Bezier curves with at least 2 keyframes. */
         if (fcu->totvert < 2 || fcu->bezt == NULL) {
-          return;
+          continue;
         }
         do_versions_291_fcurve_handles_limit(fcu);
       }



More information about the Bf-blender-cvs mailing list