Merge branch 'blender-v4.3-release'

This commit is contained in:
Bastien Montagne
2024-10-08 17:07:59 +02:00
2 changed files with 11 additions and 6 deletions

View File

@@ -29,9 +29,6 @@
#include "BKE_main_namemap.hh"
#include "BKE_packedFile.hh"
/* Unused currently. */
// static CLG_LogRef LOG = {.identifier = "bke.library"};
struct BlendDataReader;
static void library_runtime_reset(Library *lib)
@@ -238,6 +235,12 @@ void BKE_library_main_rebuild_hierarchy(Main *bmain)
{
BKE_main_relations_create(bmain, 0);
/* Reset all values, they may have been set to irrelevant values by other processes (like the
* liboverride handling e.g., see #lib_override_libraries_index_define). */
LISTBASE_FOREACH (Library *, lib_iter, &bmain->libraries) {
lib_iter->runtime.temp_index = 0;
}
/* Find all libraries with directly linked IDs (i.e. IDs used by local data). */
blender::Set<Library *> directly_used_libs;
ID *id_iter;

View File

@@ -359,10 +359,12 @@ static int action_pushdown_exec(bContext *C, wmOperator *op)
AnimData *adt = ED_actedit_animdata_from_context(C, &adt_id_owner);
/* Do the deed... */
if (adt) {
if (adt && adt->action) {
blender::animrig::Action &action = adt->action->wrap();
/* Perform the push-down operation
* - This will deal with all the AnimData-side user-counts. */
if (!adt->action->wrap().has_keyframes(adt->slot_handle)) {
if (!action.has_keyframes(adt->slot_handle)) {
/* action may not be suitable... */
BKE_report(op->reports, RPT_WARNING, "Action must have at least one keyframe or F-Modifier");
return OPERATOR_CANCELLED;
@@ -376,7 +378,7 @@ static int action_pushdown_exec(bContext *C, wmOperator *op)
/* The action needs updating too, as FCurve modifiers are to be reevaluated. They won't extend
* beyond the NLA strip after pushing down to the NLA. */
DEG_id_tag_update_ex(bmain, &adt->action->id, ID_RECALC_ANIMATION);
DEG_id_tag_update_ex(bmain, &action.id, ID_RECALC_ANIMATION);
/* Stop displaying this action in this editor
* NOTE: The editor itself doesn't set a user...