[Bf-blender-cvs] [274481620b0] modifier-panels-ui: Merge branch 'master' into modifier-panels-ui

[Hans Goudey]

Commit: 274481620b0952606b3d62496c1e5ef335aced32
Author: Hans Goudey
Date:   Tue Apr 7 12:53:00 2020 -0500
Branches: modifier-panels-ui
https://developer.blender.org/rB274481620b0952606b3d62496c1e5ef335aced32

Merge branch 'master' into modifier-panels-ui

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



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

diff --cc source/blender/editors/interface/interface_panel.c
index cfccffa7fc8,d1c61925d40..eeec0af96c0
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@@ -1774,10 -1574,13 +1774,13 @@@ static void ui_handle_panel_header
      }
      else { /* collapse */
        if (ctrl) {
-         panels_collapse_all(C, area, region, block->panel);
+         /* Only collapse all for parent panels. */
+         if (block->panel->type != NULL && block->panel->type->parent == NULL) {
 -          panels_collapse_all(area, region, block->panel);
++          panels_collapse_all(C, area, region, block->panel);
  
-         /* reset the view - we don't want to display a view without content */
-         UI_view2d_offset(&region->v2d, 0.0f, 1.0f);
+           /* reset the view - we don't want to display a view without content */
+           UI_view2d_offset(&region->v2d, 0.0f, 1.0f);
+         }
        }
  
        if (block->panel->flag & PNL_CLOSED) {