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 - +22 -7
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ebe4408d3d - Show all commits

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

@ -14,7 +14,6 @@
#include "DNA_genfile.h"
#include "DNA_movieclip_types.h"
#include "DNA_workspace_types.h"
#include "BLI_assert.h"
#include "BLI_listbase.h"
@ -23,7 +22,6 @@
#include "BKE_main.h"
#include "BKE_mesh_legacy_convert.h"
#include "BKE_node.hh"
#include "BKE_screen.h"
#include "BKE_tracking.h"
#include "BLO_readfile.h"

1
source/blender/blenloader/intern/versioning_userdef.c
View File

@ -105,6 +105,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
FROM_DEFAULT_V4_UCHAR(space_action.simulated_frames);
}
/* TODO version bump. */
{
FROM_DEFAULT_V4_UCHAR(space_view3d.asset_shelf.back);
FROM_DEFAULT_V4_UCHAR(space_view3d.asset_shelf.header_back);

26
source/blender/editors/asset/ED_asset_shelf.h
View File

@ -12,7 +12,6 @@ extern "C" {
struct ARegion;
struct ARegionType;
struct AssetShelfSettings;
struct bContext;
struct bContextDataResult;
struct BlendDataReader;
@ -21,7 +20,18 @@ struct wmWindowManager;
struct RegionPollParams;
/* -------------------------------------------------------------------- */
/* Asset Shelf Regions */
/** \name Asset Shelf Regions
*
* Naming conventions:
* - #ED_asset_shelf_regions_xxx(): Applies to both regions (#RGN_TYPE_ASSET_SHELF and
* #RGN_TYPE_ASSET_SHELF_FOOTER).
* - #ED_asset_shelf_region_xxx(): Applies to the main shelf region (#RGN_TYPE_ASSET_SHELF).
* - #ED_asset_shelf_footer_region_xxx(): Applies to the shelf footer region
* (#RGN_TYPE_ASSET_SHELF_FOOTER).
* - #ED_asset_shelf_footer_xxx(): Applies to the shelf footer region-type
* (#RGN_TYPE_ASSET_SHELF_FOOTER).
*
* \{ */
bool ED_asset_shelf_regions_poll(const struct RegionPollParams *params);
@ -33,8 +43,6 @@ void ED_asset_shelf_region_layout(const bContext *C,
struct ARegion *region,
struct AssetShelfHook *shelf_hook);
void ED_asset_shelf_region_draw(const bContext *C, struct ARegion *region);
int ED_asset_shelf_default_tile_width(void);
int ED_asset_shelf_default_tile_height(void);
int ED_asset_shelf_region_prefsizey(void);
void ED_asset_shelf_footer_region_init(struct wmWindowManager *wm, struct ARegion *region);
@ -43,8 +51,11 @@ void ED_asset_shelf_footer_region_listen(const struct wmRegionListenerParams *pa
int ED_asset_shelf_footer_size(void);
void ED_asset_shelf_footer_register(struct ARegionType *region_type, const int space_type);
/** \} */
/* -------------------------------------------------------------------- */
/* Asset Shelf Hook */
/** \name Asset Shelf Hook
* \{ */
/**
* Deep-copies \a hook into newly allocated memory. Must be freed using
@ -61,8 +72,13 @@ void ED_asset_shelf_hook_blend_write(struct BlendWriter *writer,
void ED_asset_shelf_hook_blend_read_data(struct BlendDataReader *reader,
struct AssetShelfHook **hook);
/** \} */
/* -------------------------------------------------------------------- */
int ED_asset_shelf_default_tile_width(void);
int ED_asset_shelf_default_tile_height(void);
/**
* Creates an `"asset_shelf"` context member, pointing to the active shelf in \a #shelf_hook.
*/