blender
/
blender
134
424
Fork 606
Code Issues 6.3k Pull Requests 767 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 -15
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fc86ef91e9 - Show all commits

2
source/blender/blenkernel/BKE_blender_version.h
View File

@ -25,7 +25,7 @@ extern "C" {
/* Blender file format version. */ /* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION #define BLENDER_FILE_VERSION BLENDER_VERSION
#define BLENDER_FILE_SUBVERSION 6 #define BLENDER_FILE_SUBVERSION 7
/* Minimum Blender version that supports reading file written with the current /* Minimum Blender version that supports reading file written with the current
* version. Older Blender versions will test this and show a warning if the file * version. Older Blender versions will test this and show a warning if the file

21
source/blender/blenloader/intern/versioning_300.cc
View File

@ -4311,7 +4311,7 @@ void blo_do_versions_300(FileData *fd, Library * /*lib*/, Main *bmain)
do_versions_rename_id(bmain, ID_BR, "Draw Weight", "Weight Draw"); do_versions_rename_id(bmain, ID_BR, "Draw Weight", "Weight Draw");
} }
if (!MAIN_VERSION_ATLEAST(bmain, 306, 6)) { if (!MAIN_VERSION_ATLEAST(bmain, 306, 7)) {
LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) { LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) { LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
@ -4349,20 +4349,13 @@ void blo_do_versions_300(FileData *fd, Library * /*lib*/, Main *bmain)
} }
} }
{ {
ARegion *asset_shelf = BKE_region_find_in_listbase_by_type(regionbase,
RGN_TYPE_ASSET_SHELF);
/* TODO for old files saved with the branch only. */ /* TODO for old files saved with the branch only. */
if (asset_shelf) { ARegion *new_asset_shelf = do_versions_add_region_if_not_found(
asset_shelf->flag &= ~RGN_FLAG_DYNAMIC_SIZE; regionbase,
} RGN_TYPE_ASSET_SHELF,
else { "asset shelf for view3d (versioning)",
ARegion *new_asset_shelf = do_versions_add_region_if_not_found( RGN_TYPE_ASSET_SHELF_FOOTER);
regionbase, new_asset_shelf->alignment = RGN_ALIGN_BOTTOM;
RGN_TYPE_ASSET_SHELF,
"asset shelf for view3d (versioning)",
RGN_TYPE_ASSET_SHELF_FOOTER);
new_asset_shelf->alignment = RGN_ALIGN_BOTTOM;
}
} }
} }
} }