[Bf-blender-cvs] [1ea46cd0394] property-search-ui-v2: Merge branch 'master' into property-search-ui-v2

[Hans Goudey]

Commit: 1ea46cd0394013f3e2d71a29cc914611dab1ee82
Author: Hans Goudey
Date:   Wed Aug 12 21:22:16 2020 -0400
Branches: property-search-ui-v2
https://developer.blender.org/rB1ea46cd0394013f3e2d71a29cc914611dab1ee82

Merge branch 'master' into property-search-ui-v2

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



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

diff --cc source/blender/editors/screen/area.c
index fa4de10a2b2,38bac3afef6..9a58eb0b098
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@@ -2665,30 -2658,35 +2665,36 @@@ void ED_region_panels_layout_ex(const b
    if (has_instanced_panel) {
      LISTBASE_FOREACH (Panel *, panel, &region->panels) {
        if (panel->type == NULL) {
-         continue; /* Some panels don't have a type.. */
+         continue; /* Some panels don't have a type. */
+       }
+       if (!(panel->type->flag & PNL_INSTANCED)) {
+         continue;
+       }
+       if (use_category_tabs && panel->type->category[0] &&
+           !STREQ(category, panel->type->category)) {
+         continue;
        }
-       if (panel->type->flag & PNL_INSTANCED) {
-         if (panel && UI_panel_is_dragging(panel)) {
-           /* Prevent View2d.tot rectangle size changes while dragging panels. 
*/
-           update_tot_size = false;
-         }
  
-         /* Use a unique identifier for instanced panels, otherwise an old 
block for a different
-          * panel of the same type might be found. */
-         char unique_panel_str[8];
-         UI_list_panel_unique_str(panel, unique_panel_str);
-         ed_panel_draw(C,
-                       area,
-                       region,
-                       &region->panels,
-                       panel->type,
-                       panel,
-                       (panel->type->flag & PNL_DRAW_BOX) ? w_box_panel : w,
-                       em,
-                       vertical,
-                       unique_panel_str,
-                       false);
+       if (panel && UI_panel_is_dragging(panel)) {
+         /* Prevent View2d.tot rectangle size changes while dragging panels. */
+         update_tot_size = false;
        }
+ 
+       /* Use a unique identifier for instanced panels, otherwise an old block 
for a different
+        * panel of the same type might be found. */
+       char unique_panel_str[8];
+       UI_list_panel_unique_str(panel, unique_panel_str);
+       ed_panel_draw(C,
+                     area,
+                     region,
+                     &region->panels,
+                     panel->type,
+                     panel,
+                     (panel->type->flag & PNL_DRAW_BOX) ? w_box_panel : w,
+                     em,
+                     vertical,
 -                    unique_panel_str);
++                    unique_panel_str,
++                    false);
      }
    }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs