[Bf-blender-cvs] [b9898ebde44] filebrowser_redesign: Merge branch 'master' into filebrowser_redesign

[Julian Eisel]

Commit: b9898ebde44d6584ea37a05aaeca8760d31ccc7b
Author: Julian Eisel
Date:   Sat Aug 10 13:24:26 2019 +0200
Branches: filebrowser_redesign
https://developer.blender.org/rBb9898ebde44d6584ea37a05aaeca8760d31ccc7b

Merge branch 'master' into filebrowser_redesign

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index aa9f0745df9,15b4f513050..0ef566d9e89
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3533,31 -3533,40 +3533,68 @@@ void blo_do_versions_280(FileData *fd, 
      }
    }
  
+   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. */
+     if (U.view_rotate_sensitivity_turntable == 0) {
+       U.view_rotate_sensitivity_turntable = DEG2RADF(0.4f);
+       U.view_rotate_sensitivity_trackball = 1.0f;
+     }
+     for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
+       for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
+         for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
+           if (sl->spacetype == SPACE_TEXT) {
+             ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
+             ARegion *ar = do_versions_find_region_or_null(regionbase, RGN_TYPE_UI);
+             if (ar) {
+               ar->alignment = RGN_ALIGN_RIGHT;
+             }
+           }
+         }
+       }
+     }
+   }
++
 +  {
 +    /* Versioning code until next subversion bump goes here. */
 +    for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
 +      for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
 +        for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
 +          if (sl->spacetype == SPACE_FILE) {
 +            SpaceFile *sfile = (SpaceFile *)sl;
 +            ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
 +            ARegion *ar_ui = do_versions_find_region(regionbase, RGN_TYPE_UI);
 +            ARegion *ar_header = do_versions_find_region(regionbase, RGN_TYPE_HEADER);
 +
 +            if (ar_ui && ar_header) {
 +              /* Reinsert UI region so that it spawns entire area width */
 +              BLI_remlink(regionbase, ar_ui);
 +              BLI_insertlinkafter(regionbase, ar_header, ar_ui);
 +
 +              ar_ui->flag |= RGN_FLAG_DYNAMIC_SIZE;
 +            }
 +
 +            if (sfile->params) {
 +              sfile->params->details_flags |= FILE_DETAILS_SIZE | FILE_DETAILS_DATETIME;
 +            }
 +          }
 +        }
 +      }
 +    }
 +  }
  }