blender
/
blender
137
416
Fork 599
Code Issues 6.3k Pull Requests 771 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 - +14 -8
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0f5853e293 - Show all commits

4
source/blender/editors/interface/interface.cc
View File

@ -751,8 +751,8 @@ static bool ui_but_equals_old(const uiBut *but, const uiBut *oldbut)
if (but->func != oldbut->func) {
return false;
}
if (but->apply_func.target<void(bContext &)>() !=
oldbut->apply_func.target<void(bContext &)>()) {
if (but->apply_func.target<void(bContext &)>() != oldbut->apply_func.target<void(bContext &)>())
{
return false;
}
if (but->funcN != oldbut->funcN) {

9
source/blender/editors/interface/resources.cc
View File

@ -196,7 +196,8 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid)
else if (ELEM(g_theme_state.regionid,
RGN_TYPE_HEADER,
RGN_TYPE_FOOTER,
RGN_TYPE_ASSET_SHELF_FOOTER)) {
RGN_TYPE_ASSET_SHELF_FOOTER))
{
cp = ts->header_text;
}
else {
@ -213,7 +214,8 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid)
else if (ELEM(g_theme_state.regionid,
RGN_TYPE_HEADER,
RGN_TYPE_FOOTER,
RGN_TYPE_ASSET_SHELF_FOOTER)) {
RGN_TYPE_ASSET_SHELF_FOOTER))
{
cp = ts->header_text_hi;
}
else {
@ -230,7 +232,8 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid)
else if (ELEM(g_theme_state.regionid,
RGN_TYPE_HEADER,
RGN_TYPE_FOOTER,
RGN_TYPE_ASSET_SHELF_FOOTER)) {
RGN_TYPE_ASSET_SHELF_FOOTER))
{
cp = ts->header_title;
}
else {

3
source/blender/editors/screen/screen_edit.c
View File

@ -1497,7 +1497,8 @@ static bScreen *screen_state_to_nonnormal(bContext *C,
RGN_TYPE_NAV_BAR,
RGN_TYPE_EXECUTE,
RGN_TYPE_ASSET_SHELF,
RGN_TYPE_ASSET_SHELF_FOOTER)) {
RGN_TYPE_ASSET_SHELF_FOOTER))
{
region->flag |= RGN_FLAG_HIDDEN;
}
}

6
source/blender/editors/screen/screen_ops.c
View File

@ -2658,7 +2658,8 @@ static int area_max_regionsize(ScrArea *area, ARegion *scale_region, AZEdge edge
RGN_TYPE_HEADER,
RGN_TYPE_TOOL_HEADER,
RGN_TYPE_FOOTER,
RGN_TYPE_ASSET_SHELF_FOOTER))) {
RGN_TYPE_ASSET_SHELF_FOOTER)))
{
dist -= region->winy;
}
else if (scale_region->alignment == RGN_ALIGN_BOTTOM &&
@ -2666,7 +2667,8 @@ static int area_max_regionsize(ScrArea *area, ARegion *scale_region, AZEdge edge
RGN_TYPE_HEADER,
RGN_TYPE_TOOL_HEADER,
RGN_TYPE_FOOTER,
RGN_TYPE_ASSET_SHELF_FOOTER))) {
RGN_TYPE_ASSET_SHELF_FOOTER)))
{
dist -= region->winy;
}
}