[Bf-blender-cvs] [6ac50f4bea4] soc-2019-outliner: Merge branch 'master' into soc-2019-outliner

Nathan Craddock noreply at git.blender.org
Tue Jul 23 19:23:41 CEST 2019


Commit: 6ac50f4bea42ac3530b64153c2101b41269aa716
Author: Nathan Craddock
Date:   Mon Jul 22 11:24:04 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rB6ac50f4bea42ac3530b64153c2101b41269aa716

Merge branch 'master' into soc-2019-outliner

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 4b5ae0ef866,cb2b64957f0..b65db5f6184
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3533,17 -3531,9 +3531,21 @@@ void blo_do_versions_280(FileData *fd, 
      LISTBASE_FOREACH (bArmature *, arm, &bmain->armatures) {
        arm->flag &= ~(ARM_FLAG_UNUSED_6);
      }
 +
 +    /* Marks each outliner as dirty so a sync will occur as synced selection is enabled. */
 +    for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
 +      for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
 +        for (SpaceLink *space = sa->spacedata.first; space; space = space->next) {
 +          if (space->spacetype == SPACE_OUTLINER) {
 +            SpaceOutliner *soutliner = (SpaceOutliner *)space;
 +            soutliner->flag |= SO_IS_DIRTY | SO_SYNC_SELECTION;
 +          }
 +        }
 +      }
 +    }
    }
+ 
+   {
+     /* Versioning code until next subversion bump goes here. */
+   }
  }



More information about the Bf-blender-cvs mailing list