[Bf-blender-cvs] [ddae9c92326] master: Fix T64634: Incorrect type casting in versioning code

Jacques Lucke noreply at git.blender.org
Wed May 15 17:39:21 CEST 2019


Commit: ddae9c92326486c5c95613bc0b7bb46e2d9bc261
Author: Jacques Lucke
Date:   Wed May 15 17:39:07 2019 +0200
Branches: master
https://developer.blender.org/rBddae9c92326486c5c95613bc0b7bb46e2d9bc261

Fix T64634: Incorrect type casting in versioning code

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

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

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

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 526931d1a45..d8f133c7465 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -3376,12 +3376,12 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 
     for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
       for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
-        if (ELEM(sa->spacetype, SPACE_CLIP, SPACE_GRAPH, SPACE_SEQ)) {
-          for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
+        for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
+          if (ELEM(sl->spacetype, SPACE_CLIP, SPACE_GRAPH, SPACE_SEQ)) {
             ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
 
             ARegion *ar = NULL;
-            if (sa->spacetype == SPACE_CLIP) {
+            if (sl->spacetype == SPACE_CLIP) {
               if (((SpaceClip *)sl)->view == SC_VIEW_GRAPH) {
                 ar = do_versions_find_region(regionbase, RGN_TYPE_PREVIEW);
               }



More information about the Bf-blender-cvs mailing list