[Bf-blender-cvs] [091736088ea] soc-2019-outliner: Merge branch 'master' into soc-2019-outliner

[Nathan Craddock]

Commit: 091736088ea284c8f441be56cf39610580b53575
Author: Nathan Craddock
Date:   Thu Aug 1 16:10:44 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rB091736088ea284c8f441be56cf39610580b53575

Merge branch 'master' into soc-2019-outliner

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index b65db5f6184,1a79b7c9b5a..9df39fe15a2
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3531,20 -3531,24 +3531,36 @@@ 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;
 +          }
 +        }
 +      }
 +    }
    }
  
+   if (!MAIN_VERSION_ATLEAST(bmain, 281, 1)) {
+     LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
+       for (ModifierData *md = ob->modifiers.first; md; md = md->next) {
+         if (md->type == eModifierType_DataTransfer) {
+           /* Now datatransfer's mix factor is multiplied with weights when any,
+            * instead of being ignored,
+            * we need to take care of that to keep 'old' files compatible. */
+           DataTransferModifierData *dtmd = (DataTransferModifierData *)md;
+           if (dtmd->defgrp_name[0] != '\0') {
+             dtmd->mix_factor = 1.0f;
+           }
+         }
+       }
+     }
+   }
+ 
    {
      /* Versioning code until next subversion bump goes here. */
    }