3fd430d1c6
Update `BKE_fcurves_id_cb(id, callback)` so that it only reports F-Curves for `id`. With legacy Actions this used to be "all F-Curves in the Action", but with slotted Actions it should only report the F-Curves for the assigned slot. `BKE_fcurves_id_cb()` is used in two places: 1. Updating F-Curve paths in versioning, for example when node sockets were added/removed. For this it is vital that the updates only happen for those nodes that were actually affected by this versioning code, and not blindly for all F-Curves in the Action. 2. Marking properties as 'animated' in the depsgraph, and the 'value backup' for those properties. This should also be only done for the properties of that ID, and thus be limited to the F-Curves for the assigned slot. Pull Request: https://projects.blender.org/blender/blender/pulls/134851
76 lines
2.6 KiB
C++
76 lines
2.6 KiB
C++
/* SPDX-FileCopyrightText: 2025 Blender Authors
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
#include "BKE_action.hh"
|
|
|
|
#include "ANIM_action.hh"
|
|
|
|
#include "DNA_action_types.h"
|
|
#include "DNA_anim_types.h"
|
|
|
|
#include "BLI_vector.hh"
|
|
|
|
#include "testing/testing.h"
|
|
|
|
namespace blender::bke::tests {
|
|
|
|
TEST(anim_data, BKE_fcurves_id_cb_test)
|
|
{
|
|
/* BKE_id_free() hits a code path that uses CLOG, which crashes if not initialized properly. */
|
|
CLG_init();
|
|
/* To make id_can_have_animdata() and friends work, the `id_types` array needs to be set up. */
|
|
BKE_idtype_init();
|
|
|
|
Main *bmain = BKE_main_new();
|
|
Action *action = static_cast<Action *>(BKE_id_new(bmain, ID_AC, "ACÄnimåtië"));
|
|
Object *cube = BKE_object_add_only_object(bmain, OB_EMPTY, "Küüübus");
|
|
Object *suzanne = BKE_object_add_only_object(bmain, OB_EMPTY, "OBSuzanne");
|
|
|
|
/* Create F-Curves for Cube. */
|
|
ASSERT_TRUE(animrig::assign_action(action, cube->id));
|
|
const FCurve *fcurve_cube_loc1 = animrig::action_fcurve_ensure(
|
|
bmain, *action, cube->id, {"location", 1});
|
|
const FCurve *fcurve_cube_scale2 = animrig::action_fcurve_ensure(
|
|
bmain, *action, cube->id, {"scale", 2});
|
|
|
|
/* Create F-Curves for Suzanne. */
|
|
ASSERT_TRUE(animrig::assign_action(action, suzanne->id));
|
|
const FCurve *fcurve_suzanne_loc0 = animrig::action_fcurve_ensure(
|
|
bmain, *action, suzanne->id, {"location", 0});
|
|
const FCurve *fcurve_suzanne_scale1 = animrig::action_fcurve_ensure(
|
|
bmain, *action, suzanne->id, {"scale", 1});
|
|
|
|
/* Test that BKE_fcurves_id_cb only reports F-Curves that are meant for that ID. */
|
|
Vector<ID *> reported_ids;
|
|
Vector<FCurve *> reported_fcurves;
|
|
const auto callback = [&reported_fcurves](ID *id, FCurve *fcurve) {
|
|
reported_ids.push_back(id);
|
|
reported_fcurves.push_back(fcurve);
|
|
};
|
|
|
|
BKE_fcurves_id_cb(&cube->id, callback);
|
|
EXPECT_EQ(1, reported_ids.size());
|
|
EXPECT_EQ(2, reported_fcurves.size());
|
|
EXPECT_EQ(&cube->id, reported_ids[0]);
|
|
EXPECT_EQ(fcurve_cube_loc1, reported_fcurves[0]);
|
|
EXPECT_EQ(fcurve_cube_scale2, reported_fcurves[1]);
|
|
|
|
/* Also test for Suzanne, as that's a different slot. The first slot could
|
|
* have been covered by legacy-compatible code. */
|
|
reported_ids.clear();
|
|
reported_fcurves.clear();
|
|
|
|
BKE_fcurves_id_cb(&cube->id, callback);
|
|
EXPECT_EQ(1, reported_ids.size());
|
|
EXPECT_EQ(2, reported_fcurves.size());
|
|
EXPECT_EQ(&suzanne->id, reported_ids[0]);
|
|
EXPECT_EQ(fcurve_suzanne_loc0, reported_fcurves[0]);
|
|
EXPECT_EQ(fcurve_suzanne_scale1, reported_fcurves[1]);
|
|
|
|
BKE_main_free(bmain);
|
|
CLG_exit();
|
|
}
|
|
|
|
} // namespace blender::bke::tests
|