griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Bastien Montagne
2024-11-05 15:01:20 +01:00
parent b35a5df8c9 e2b1e9912c
commit 2c9e7676a3
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/blenloader/intern/readfile.cc
View File

@@ -4004,6 +4004,13 @@ static void expand_doit_library(void *fdhandle, Main *mainvar, void *old)
if (bhead == nullptr) {
return;
}
/* In 2.50+ file identifier for screens is patched, forward compatibility. */
if (bhead->code == ID_SCRN) {
bhead->code = ID_SCR;
}
if (!blo_bhead_is_id_valid_type(bhead)) {
return;
}
if (bhead->code == ID_LINK_PLACEHOLDER) {
/* Placeholder link to data-block in another library. */
@@ -4074,11 +4081,6 @@ static void expand_doit_library(void *fdhandle, Main *mainvar, void *old)
}
else {
/* Data-block in same library. */
/* In 2.50+ file identifier for screens is patched, forward compatibility. */
if (bhead->code == ID_SCRN) {
bhead->code = ID_SCR;
}
ID *id = library_id_is_yet_read(fd, mainvar, bhead);
if (id == nullptr) {
read_libblock(
@@ -4184,7 +4186,7 @@ static ID *link_named_part(
BLI_assert(BKE_idtype_idcode_is_linkable(idcode) && BKE_idtype_idcode_is_valid(idcode));
if (bhead) {
if (bhead && blo_bhead_is_id_valid_type(bhead)) {
id = library_id_is_yet_read(fd, mainl, bhead);
if (id == nullptr) {
/* not read yet */
@@ -4217,8 +4219,7 @@ static ID *link_named_part(
id = nullptr;
}
/* if we found the id but the id is nullptr, this is really bad */
BLI_assert(!((bhead != nullptr) && (id == nullptr)));
/* NOTE: `id` may be `nullptr` even if a BHead was found, in case e.g. it is an invalid BHead. */
return id;
}

2
source/blender/editors/interface/interface_handlers.cc
View File

@@ -4828,7 +4828,7 @@ static int ui_do_but_TEX(
/* Pass, allow file-selector, enter to execute. */
}
else if (ELEM(but->emboss, UI_EMBOSS_NONE, UI_EMBOSS_NONE_OR_STATUS) &&
((event->modifier & (KM_CTRL | KM_SHIFT | KM_ALT)) != KM_CTRL))
((event->modifier & (KM_SHIFT | KM_CTRL | KM_ALT | KM_OSKEY)) != KM_CTRL))
{
/* Pass. */
}