blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 780 Projects 19 Wiki Activity

UI: Asset Shelf (Experimental Feature) #104831

Closed
Julian Eisel wants to merge 399 commits from asset-shelf into main
pull from: asset-shelf
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 30 Commits 399 Files Changed - +8 -7
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 83a0641fcd - Show all commits

2
source/blender/blenloader/intern/versioning_userdef.cc
View File

@ -109,7 +109,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
if (!USER_VERSION_ATLEAST(400, 12)) {
FROM_DEFAULT_V4_UCHAR(space_node.node_zone_repeat);
}
/* TODO version bump. */
{
FROM_DEFAULT_V4_UCHAR(space_view3d.asset_shelf.back);

13
source/blender/windowmanager/intern/wm_draw.cc
View File

@ -908,13 +908,14 @@ static void wm_draw_window_offscreen(bContext *C, wmWindow *win, bool stereo)
if (region->flag & RGN_FLAG_POLL_FAILED) {
continue;
}
/* The region size may be set dynamically through #ARegionType.layout(). So if the region is
* only hidden because it's too small, still run the layout in case that leads to a different
* region size. */
const bool hidden_because_too_small = (region->flag & RGN_FLAG_TOO_SMALL) &&
!(region->flag & RGN_FLAG_HIDDEN);
/* Dynamic region may have been flagged as too small because their size on init is 0.
* ARegion.visible is false then, as expected. The layout should still be created then, so
* the region size can be updated (it may turn out to be not too small then). */
const bool ignore_visibility = (region->flag & RGN_FLAG_DYNAMIC_SIZE) &&
(region->flag & RGN_FLAG_TOO_SMALL) &&
!(region->flag & RGN_FLAG_HIDDEN);
if ((region->visible || hidden_because_too_small) && region->do_draw && region->type &&
if ((region->visible || ignore_visibility) && region->do_draw && region->type &&
region->type->layout)
{
CTX_wm_region_set(C, region);