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

Fix: FCurve Settings RNA paths incomplete

Browse Source 
Fill the missing gaps by going over the action data until we find the
corresponding FCurve in Layer < Slots > Channebags > FCurves.
Channelbads have their `_path` function already, so we can piggyback on
that, just adding the proper FCurve index to the mix.

Part of #137407

Pull Request: https://projects.blender.org/blender/blender/pulls/137956
This commit is contained in:
Philipp Oeser
2025-05-14 09:15:44 +02:00
committed by Philipp Oeser
parent 247d8183f8
commit 5a882c7628
3 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/makesrna/intern/rna_action.cc
View File

@@ -585,7 +585,7 @@ static bool rna_ActionStrip_key_insert(ID *dna_action_id,
return ok;
}
static std::optional<std::string> rna_Channelbag_path(const PointerRNA *ptr)
std::optional<std::string> rna_Channelbag_path(const PointerRNA *ptr)
{
animrig::Action &action = rna_action(ptr);
animrig::Channelbag &cbag_to_find = rna_data_channelbag(ptr);

31
source/blender/makesrna/intern/rna_fcurve.cc
View File

@@ -24,6 +24,8 @@
#include "ED_keyframing.hh"
#include <fmt/format.h>
const EnumPropertyItem rna_enum_fmodifier_type_items[] = {
{FMODIFIER_TYPE_NULL, "NULL", 0, "Invalid", ""},
{FMODIFIER_TYPE_GENERATOR,
@@ -550,6 +552,34 @@ static void rna_FKeyframe_ctrlpoint_ui_set(PointerRNA *ptr, const float *values)
/* ****************************** */
static std::optional<std::string> rna_FCurve_path(const PointerRNA *ptr)
{
using namespace blender;
FCurve *fcurve = reinterpret_cast<FCurve *>(ptr->data);
animrig::Action &action = reinterpret_cast<bAction *>(ptr->owner_id)->wrap();
for (animrig::Layer *layer : action.layers()) {
for (animrig::Strip *strip : layer->strips()) {
if (strip->type() != animrig::Strip::Type::Keyframe) {
continue;
}
animrig::StripKeyframeData &strip_data = strip->data<animrig::StripKeyframeData>(action);
for (animrig::Channelbag *channelbag : strip_data.channelbags()) {
const int fcurve_index = channelbag->fcurves().first_index_try(fcurve);
if (fcurve_index != -1) {
PointerRNA channelbag_ptr = RNA_pointer_create_discrete(
&action.id, &RNA_ActionChannelbag, channelbag);
const std::optional<std::string> channelbag_path = rna_Channelbag_path(&channelbag_ptr);
return fmt::format("{}.fcurves[{}]", *channelbag_path, fcurve_index);
}
}
}
}
return std::nullopt;
}
static void rna_FCurve_RnaPath_get(PointerRNA *ptr, char *value)
{
FCurve *fcu = (FCurve *)ptr->data;
@@ -2538,6 +2568,7 @@ static void rna_def_fcurve(BlenderRNA *brna)
srna = RNA_def_struct(brna, "FCurve", nullptr);
RNA_def_struct_ui_text(srna, "F-Curve", "F-Curve defining values of a period of time");
RNA_def_struct_ui_icon(srna, ICON_ANIM_DATA);
RNA_def_struct_path_func(srna, "rna_FCurve_path");
/* Enums */
prop = RNA_def_property(srna, "extrapolation", PROP_ENUM, PROP_NONE);

2
source/blender/makesrna/intern/rna_internal.hh
View File

@@ -395,6 +395,8 @@ std::optional<std::string> rna_ColorManagedDisplaySettings_path(const PointerRNA
std::optional<std::string> rna_ColorManagedViewSettings_path(const PointerRNA *ptr);
std::optional<std::string> rna_ColorManagedInputColorspaceSettings_path(const PointerRNA *ptr);
std::optional<std::string> rna_Channelbag_path(const PointerRNA *ptr);
/* Node socket subtypes for group interface. */
void rna_def_node_socket_interface_subtypes(BlenderRNA *brna);