[Bf-blender-cvs] [da0ef1daac7] sculpt-dev: Merge branch 'master' into sculpt-dev

[Pablo Dobarro]

Commit: da0ef1daac744ed3cdf1a0d8dd64a0aa32f474eb
Author: Pablo Dobarro
Date:   Fri Feb 19 22:24:49 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rBda0ef1daac744ed3cdf1a0d8dd64a0aa32f474eb

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index 93cdf8624f8,29041f4ae9d..4627e07caa7
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -1742,9 -1740,19 +1741,22 @@@ void blo_do_versions_290(FileData *fd, 
        }
      }
  
+     /* Add subpanels for FModifiers, which requires a field to store expansion. */
+     if (!DNA_struct_elem_find(fd->filesdna, "FModifier", "short", "ui_expand_flag")) {
+       LISTBASE_FOREACH (bAction *, act, &bmain->actions) {
+         LISTBASE_FOREACH (FCurve *, fcu, &act->curves) {
+           LISTBASE_FOREACH (FModifier *, fcm, &fcu->modifiers) {
+             SET_FLAG_FROM_TEST(fcm->ui_expand_flag,
+                                fcm->flag & FMODIFIER_FLAG_EXPANDED,
+                                UI_PANEL_DATA_EXPAND_ROOT);
+           }
+         }
+       }
+     }
+ 
      /* Keep this block, even when empty. */
 +    LISTBASE_FOREACH (Brush *, br, &bmain->brushes) {
 +      BKE_brush_default_input_curves_set(br);
 +    }
    }
  }