blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 779 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 - +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit efdf201477 - Show all commits

4
source/blender/editors/asset/intern/asset_shelf.cc
View File

@ -286,8 +286,8 @@ static int main_region_padding_y()
static int main_region_padding_x()
{
const uiStyle *style = UI_style_get_dpi();
return style->buttonspacex;
/* Use the same as the height, equal padding looks nice. */
return main_region_padding_y();
}
int ED_asset_shelf_region_snap(const ARegion *region, const int size, const int axis)