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

Merge branch 'blender-v4.4-release'

Browse Source
This commit is contained in:
Sergey Sharybin
2025-03-14 18:36:53 +01:00
parent 759923fdd7 dd3640ef0f
commit f243f13549
4 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/blender/addon/properties.py
View File

@@ -1583,9 +1583,8 @@ class CyclesPreferences(bpy.types.AddonPreferences):
)
use_hiprt: BoolProperty(
name="HIP RT (Experimental)",
description="HIP RT enables AMD hardware ray tracing on RDNA2 and above. "
"This feature is experimental and some scenes may render incorrectly",
name="HIP RT",
description="HIP RT enables AMD hardware ray tracing on RDNA2 and above",
default=False,
)

27
source/blender/animrig/intern/versioning.cc
View File

@@ -200,16 +200,17 @@ void convert_legacy_action_assignments(Main &bmain, ReportList *reports)
Action &action = dna_action->wrap();
if (action.slot_array_num == 0) {
/* animated_id is from an older file (because it is in the being-versioned-right-now bmain),
* and it's referring to an Action from an already-versioned library file. We know this
* because versioned legacy Actions always have a single slot called "Legacy Slot", and so
* this Action must have been opened in some Blender and had its slot removed. */
/* Another reason that there is no slot is that it was a _really_ old (pre-2.50)
* Action that should have been upgraded already. */
BLI_assert_msg(BLI_listbase_is_empty(&action.chanbase),
"Did not expect pre-2.5 Action at this stage of the versioning code");
/* There's a few reasons why this Action doesn't have a slot. It could simply be a slotted
* Action without slots, or a legacy-but-not-yet-versioned Action, or it could be it is a
* _really_ old (pre-2.50) Action. The latter are upgraded in do_versions_after_setup(), but
* this function can be called earlier than that. So better gracefully skip those. */
return true;
}
/* If there is already a slot assigned, there's nothing to do here. */
PointerRNA current_slot_ptr = RNA_property_pointer_get(&action_slot_owner_ptr,
&action_slot_prop);
if (current_slot_ptr.data) {
return true;
}
@@ -255,12 +256,17 @@ void convert_legacy_action_assignments(Main &bmain, ReportList *reports)
return true;
};
/* Note that the code below does not remove the `action_assignment_needs_slot` tag. One ID can
* use multiple Actions (via NLA, Action constraints, etc.); if one of those Action is an ancient
* one one from before 2.50 (just to name one example case) this ID may needs to be re-visited
* after those were versioned. Rather than trying to figure out if re-visiting is necessary, this
* function is safe to call multiple times, and all that's lost is a little bit of CPU time. */
ID *id;
FOREACH_MAIN_ID_BEGIN (&bmain, id) {
/* Process the ID itself. */
if (BLO_readfile_id_runtime_tags(*id).action_assignment_needs_slot) {
foreach_action_slot_use_with_rna(*id, version_slot_assignment);
id->runtime.readfile_data->tags.action_assignment_needs_slot = false;
}
/* Process embedded IDs, as these are not listed in bmain, but still can
@@ -270,7 +276,6 @@ void convert_legacy_action_assignments(Main &bmain, ReportList *reports)
bNodeTree *node_tree = blender::bke::node_tree_from_id(id);
if (node_tree && BLO_readfile_id_runtime_tags(node_tree->id).action_assignment_needs_slot) {
foreach_action_slot_use_with_rna(node_tree->id, version_slot_assignment);
node_tree->id.runtime.readfile_data->tags.action_assignment_needs_slot = false;
}
}
FOREACH_MAIN_ID_END;

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

@@ -1526,6 +1526,7 @@ void do_versions_after_linking_400(FileData *fd, Main *bmain)
if (!MAIN_VERSION_FILE_ATLEAST(bmain, 404, 2)) {
blender::animrig::versioning::convert_legacy_animato_actions(*bmain);
blender::animrig::versioning::tag_action_users_for_slotted_actions_conversion(*bmain);
blender::animrig::versioning::convert_legacy_action_assignments(*bmain, fd->reports->reports);
}
if (!MAIN_VERSION_FILE_ATLEAST(bmain, 404, 7)) {

11
source/blender/blenloader/tests/blendfile_loading_base_test.cc
View File

@@ -13,6 +13,7 @@
#include "BKE_idtype.hh"
#include "BKE_image.hh"
#include "BKE_layer.hh"
#include "BKE_lib_id.hh"
#include "BKE_main.hh"
#include "BKE_mball_tessellate.hh"
#include "BKE_modifier.hh"
@@ -68,22 +69,20 @@ void BlendfileLoadingBaseTest::SetUpTestCase()
BKE_vfont_builtin_register(datatoc_bfont_pfb, datatoc_bfont_pfb_size);
BLF_init();
BKE_blender_globals_main_replace(BKE_main_new());
G.background = true;
G.factory_startup = true;
/* Allocate a dummy window manager. The real window manager will try and load Python scripts from
* the release directory, which it won't be able to find. */
ASSERT_EQ(G.main->wm.first, nullptr);
G.main->wm.first = MEM_callocN(sizeof(wmWindowManager), __func__);
wmWindowManager *wm = static_cast<wmWindowManager *>(BKE_id_new(G.main, ID_WM, "WMdummy"));
wm->runtime = MEM_new<blender::bke::WindowManagerRuntime>(__func__);
}
void BlendfileLoadingBaseTest::TearDownTestCase()
{
if (G.main->wm.first != nullptr) {
MEM_freeN(G.main->wm.first);
G.main->wm.first = nullptr;
}
/* Copied from WM_exit_ex() in wm_init_exit.cc, and cherry-picked those lines that match the
* allocation/initialization done in SetUpTestCase(). */
BKE_blender_free();