5e28601d69
Splits the flag `..._FLAG_INSERTNEEDED` between autokey and manual keying. The fact that this flag was shared between the two systems has been the cause of issues in the past. It wouldn't let you insert a keyframe even though you explicitly used an operator to do so. In order to be clearer what options are used where, the user preferences have been reordered. By default "Only Insert Needed" will be enabled for auto-keying, but not for manual keying. The versioning code will enable both if it was enabled previously. # Code side changes The keying system has flags that define the behavior when keys are inserted. Some of those flags were shared between keying and auto-keying. Some were only used for auto-keying. To clarify that, prefix flags that used exclusively in one or the other system with `AUTOKEY`/`MANUALKEY` Also the flag name on the user preferences and the tool settings was renamed. Previously it was called `autokey_flag`. To indicated that it is not only used for autokeying, rename it `keying_flag`. Fixes: #73773 Pull Request: https://projects.blender.org/blender/blender/pulls/115525
110 lines
3.1 KiB
C++
110 lines
3.1 KiB
C++
/* SPDX-FileCopyrightText: 2023 Blender Authors
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
/** \file
|
|
* \ingroup animrig
|
|
*/
|
|
|
|
#include "ANIM_action.hh"
|
|
#include "BKE_action.h"
|
|
#include "BKE_fcurve.h"
|
|
#include "BLI_listbase.h"
|
|
#include "BLI_string.h"
|
|
#include "DEG_depsgraph_build.hh"
|
|
#include "DNA_anim_types.h"
|
|
|
|
#include "RNA_access.hh"
|
|
#include "RNA_path.hh"
|
|
#include "RNA_prototypes.h"
|
|
|
|
namespace blender::animrig {
|
|
|
|
FCurve *action_fcurve_find(bAction *act, const char rna_path[], const int array_index)
|
|
{
|
|
if (ELEM(nullptr, act, rna_path)) {
|
|
return nullptr;
|
|
}
|
|
return BKE_fcurve_find(&act->curves, rna_path, array_index);
|
|
}
|
|
|
|
FCurve *action_fcurve_ensure(Main *bmain,
|
|
bAction *act,
|
|
const char group[],
|
|
PointerRNA *ptr,
|
|
const char rna_path[],
|
|
const int array_index)
|
|
{
|
|
if (ELEM(nullptr, act, rna_path)) {
|
|
return nullptr;
|
|
}
|
|
|
|
/* Try to find f-curve matching for this setting.
|
|
* - add if not found and allowed to add one
|
|
* TODO: add auto-grouping support? how this works will need to be resolved
|
|
*/
|
|
FCurve *fcu = BKE_fcurve_find(&act->curves, rna_path, array_index);
|
|
|
|
if (fcu != nullptr) {
|
|
return fcu;
|
|
}
|
|
|
|
fcu = BKE_fcurve_create();
|
|
|
|
fcu->flag = (FCURVE_VISIBLE | FCURVE_SELECTED);
|
|
fcu->auto_smoothing = U.auto_smoothing_new;
|
|
if (BLI_listbase_is_empty(&act->curves)) {
|
|
fcu->flag |= FCURVE_ACTIVE;
|
|
}
|
|
|
|
fcu->rna_path = BLI_strdup(rna_path);
|
|
fcu->array_index = array_index;
|
|
|
|
if (U.keying_flag & KEYING_FLAG_XYZ2RGB && ptr != nullptr) {
|
|
/* For Loc/Rot/Scale and also Color F-Curves, the color of the F-Curve in the Graph Editor,
|
|
* is determined by the array index for the F-Curve.
|
|
*/
|
|
PropertyRNA *resolved_prop;
|
|
PointerRNA resolved_ptr;
|
|
PointerRNA id_ptr = RNA_id_pointer_create(ptr->owner_id);
|
|
const bool resolved = RNA_path_resolve_property(
|
|
&id_ptr, rna_path, &resolved_ptr, &resolved_prop);
|
|
if (resolved) {
|
|
PropertySubType prop_subtype = RNA_property_subtype(resolved_prop);
|
|
if (ELEM(prop_subtype, PROP_TRANSLATION, PROP_XYZ, PROP_EULER, PROP_COLOR, PROP_COORDS)) {
|
|
fcu->color_mode = FCURVE_COLOR_AUTO_RGB;
|
|
}
|
|
else if (ELEM(prop_subtype, PROP_QUATERNION)) {
|
|
fcu->color_mode = FCURVE_COLOR_AUTO_YRGB;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (group) {
|
|
bActionGroup *agrp = BKE_action_group_find_name(act, group);
|
|
|
|
if (agrp == nullptr) {
|
|
agrp = action_groups_add_new(act, group);
|
|
|
|
/* Sync bone group colors if applicable. */
|
|
if (ptr && (ptr->type == &RNA_PoseBone)) {
|
|
const bPoseChannel *pchan = static_cast<const bPoseChannel *>(ptr->data);
|
|
action_group_colors_set_from_posebone(agrp, pchan);
|
|
}
|
|
}
|
|
|
|
action_groups_add_channel(act, agrp, fcu);
|
|
}
|
|
else {
|
|
BLI_addtail(&act->curves, fcu);
|
|
}
|
|
|
|
/* New f-curve was added, meaning it's possible that it affects
|
|
* dependency graph component which wasn't previously animated.
|
|
*/
|
|
DEG_relations_tag_update(bmain);
|
|
|
|
return fcu;
|
|
}
|
|
} // namespace blender::animrig
|