Merge branch 'blender-v2.91-release'

This commit is contained in:
2020-11-17 10:17:00 -05:00
6 changed files with 18 additions and 1 deletions

View File

@@ -289,6 +289,8 @@ enum {
PANEL_TYPE_INSTANCED = (1 << 4),
/** Draw panel like a box widget. */
PANEL_TYPE_DRAW_BOX = (1 << 6),
/** Don't search panels with this type during property search. */
PANEL_TYPE_NO_SEARCH = (1 << 7),
};
/* uilist types */

View File

@@ -464,6 +464,9 @@ void CLOSURE_NAME(vec3 N
float btdf = get_btdf_lut(NV, roughness, ior);
out_refr += refr_accum.rgb * btdf;
/* Global toggle for lightprobe baking. */
out_refr *= float(specToggle);
# endif
# ifdef CLOSURE_CLEARCOAT

View File

@@ -5169,6 +5169,10 @@ bool UI_block_apply_search_filter(uiBlock *block, const char *search_filter)
return false;
}
if (block->panel && block->panel->type && block->panel->type->flag & PANEL_TYPE_NO_SEARCH) {
return false;
}
const bool panel_label_matches = block_search_panel_label_matches(block, search_filter);
const bool has_result = (panel_label_matches) ?

View File

@@ -3089,6 +3089,11 @@ static bool panel_property_search(const bContext *C,
uiBlock *block = UI_block_begin(C, region, panel_type->idname, UI_EMBOSS);
UI_block_set_search_only(block, true);
/* Skip panels that give meaningless search results. */
if (panel_type->flag & PANEL_TYPE_NO_SEARCH) {
return false;
}
if (panel == NULL) {
bool open; /* Dummy variable. */
panel = UI_panel_begin(region, &region->panels, block, panel_type, panel, &open);

View File

@@ -1216,7 +1216,7 @@ void buttons_context_register(ARegionType *art)
strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
pt->poll = buttons_panel_context_poll;
pt->draw = buttons_panel_context_draw;
pt->flag = PANEL_TYPE_NO_HEADER;
pt->flag = PANEL_TYPE_NO_HEADER | PANEL_TYPE_NO_SEARCH;
BLI_addtail(&art->paneltypes, pt);
}

View File

@@ -402,6 +402,9 @@ static void property_search_all_tabs(const bContext *C,
ScrArea *area_original = CTX_wm_area(C);
ScrArea area_copy = *area_original;
ARegion *region_copy = BKE_area_region_copy(area_copy.type, region_original);
/* Set the region visible field. Otherwise some layout code thinks we're drawing in a popup.
* This likely isn't necessary, but it's nice to emulate a "real" region where possible. */
region_copy->visible = true;
CTX_wm_area_set((bContext *)C, &area_copy);
CTX_wm_region_set((bContext *)C, region_copy);