From ad0ac1a8a4c6379464ec5973f7de8f217ca0fe37 Mon Sep 17 00:00:00 2001 From: Christoph Lendenfeld Date: Thu, 12 Oct 2023 16:24:56 +0200 Subject: [PATCH 1/2] remove ED prefix --- source/blender/animrig/ANIM_keyframing.hh | 19 +++++++++---------- .../blender/animrig/intern/keyframing_auto.cc | 19 +++++++++---------- source/blender/editors/armature/pose_edit.cc | 2 +- .../editors/armature/pose_transform.cc | 2 +- .../editors/interface/interface_anim.cc | 2 +- .../editors/object/object_transform.cc | 2 +- .../editors/space_view3d/view3d_snap.cc | 8 ++++---- .../transform_convert_sequencer_image.cc | 10 +++++----- .../gizmo/intern/wm_gizmo_target_props.cc | 2 +- 9 files changed, 32 insertions(+), 34 deletions(-) diff --git a/source/blender/animrig/ANIM_keyframing.hh b/source/blender/animrig/ANIM_keyframing.hh index bbe6c9fa28e..288131f4588 100644 --- a/source/blender/animrig/ANIM_keyframing.hh +++ b/source/blender/animrig/ANIM_keyframing.hh @@ -128,9 +128,8 @@ bool autokeyframe_cfra_can_key(const Scene *scene, ID *id); void autokeyframe_object(bContext *C, Scene *scene, ViewLayer *view_layer, Object *ob, int tmode); -bool ED_autokeyframe_object(bContext *C, Scene *scene, Object *ob, KeyingSet *ks); -bool ED_autokeyframe_pchan( - bContext *C, Scene *scene, Object *ob, bPoseChannel *pchan, KeyingSet *ks); +bool autokeyframe_object(bContext *C, Scene *scene, Object *ob, KeyingSet *ks); +bool autokeyframe_pchan(bContext *C, Scene *scene, Object *ob, bPoseChannel *pchan, KeyingSet *ks); /** * Use for auto-key-framing. @@ -138,13 +137,13 @@ bool ED_autokeyframe_pchan( * properties. This is by design when using buttons. For other callers such as gizmos or sequencer * preview transform, creating new animation/keyframes also on non-keyed properties is desired. */ -bool ED_autokeyframe_property(bContext *C, - Scene *scene, - PointerRNA *ptr, - PropertyRNA *prop, - int rnaindex, - float cfra, - bool only_if_property_keyed); +bool autokeyframe_property(bContext *C, + Scene *scene, + PointerRNA *ptr, + PropertyRNA *prop, + int rnaindex, + float cfra, + bool only_if_property_keyed); /** \} */ diff --git a/source/blender/animrig/intern/keyframing_auto.cc b/source/blender/animrig/intern/keyframing_auto.cc index 06d8fb51523..a254f3fba85 100644 --- a/source/blender/animrig/intern/keyframing_auto.cc +++ b/source/blender/animrig/intern/keyframing_auto.cc @@ -207,7 +207,7 @@ void autokeyframe_object(bContext *C, Scene *scene, ViewLayer *view_layer, Objec } } -bool ED_autokeyframe_object(bContext *C, Scene *scene, Object *ob, KeyingSet *ks) +bool autokeyframe_object(bContext *C, Scene *scene, Object *ob, KeyingSet *ks) { /* auto keyframing */ if (autokeyframe_cfra_can_key(scene, &ob->id)) { @@ -227,8 +227,7 @@ bool ED_autokeyframe_object(bContext *C, Scene *scene, Object *ob, KeyingSet *ks return false; } -bool ED_autokeyframe_pchan( - bContext *C, Scene *scene, Object *ob, bPoseChannel *pchan, KeyingSet *ks) +bool autokeyframe_pchan(bContext *C, Scene *scene, Object *ob, bPoseChannel *pchan, KeyingSet *ks) { if (autokeyframe_cfra_can_key(scene, &ob->id)) { ListBase dsources = {nullptr, nullptr}; @@ -248,13 +247,13 @@ bool ED_autokeyframe_pchan( return false; } -bool ED_autokeyframe_property(bContext *C, - Scene *scene, - PointerRNA *ptr, - PropertyRNA *prop, - int rnaindex, - float cfra, - const bool only_if_property_keyed) +bool autokeyframe_property(bContext *C, + Scene *scene, + PointerRNA *ptr, + PropertyRNA *prop, + int rnaindex, + float cfra, + const bool only_if_property_keyed) { Main *bmain = CTX_data_main(C); Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C); diff --git a/source/blender/editors/armature/pose_edit.cc b/source/blender/editors/armature/pose_edit.cc index 4627da769b4..7d81df2b0e8 100644 --- a/source/blender/editors/armature/pose_edit.cc +++ b/source/blender/editors/armature/pose_edit.cc @@ -825,7 +825,7 @@ static int pose_flip_quats_exec(bContext *C, wmOperator * /*op*/) /* quaternions have 720 degree range */ negate_v4(pchan->quat); - blender::animrig::ED_autokeyframe_pchan(C, scene, ob_iter, pchan, ks); + blender::animrig::autokeyframe_pchan(C, scene, ob_iter, pchan, ks); } } FOREACH_PCHAN_SELECTED_IN_OBJECT_END; diff --git a/source/blender/editors/armature/pose_transform.cc b/source/blender/editors/armature/pose_transform.cc index b02974e6c7e..d1c5e953f6e 100644 --- a/source/blender/editors/armature/pose_transform.cc +++ b/source/blender/editors/armature/pose_transform.cc @@ -910,7 +910,7 @@ static int pose_paste_exec(bContext *C, wmOperator *op) bPoseChannel *pchan = pose_bone_do_paste(ob, chan, selOnly, flip); if (pchan != nullptr) { /* Keyframing tagging for successful paste, */ - blender::animrig::ED_autokeyframe_pchan(C, scene, ob, pchan, ks); + blender::animrig::autokeyframe_pchan(C, scene, ob, pchan, ks); } } } diff --git a/source/blender/editors/interface/interface_anim.cc b/source/blender/editors/interface/interface_anim.cc index f255323b886..ff32a162c5e 100644 --- a/source/blender/editors/interface/interface_anim.cc +++ b/source/blender/editors/interface/interface_anim.cc @@ -302,7 +302,7 @@ bool ui_but_anim_expression_create(uiBut *but, const char *str) void ui_but_anim_autokey(bContext *C, uiBut *but, Scene *scene, float cfra) { - blender::animrig::ED_autokeyframe_property( + blender::animrig::autokeyframe_property( C, scene, &but->rnapoin, but->rnaprop, but->rnaindex, cfra, true); } diff --git a/source/blender/editors/object/object_transform.cc b/source/blender/editors/object/object_transform.cc index 43d88178aec..3adfc065468 100644 --- a/source/blender/editors/object/object_transform.cc +++ b/source/blender/editors/object/object_transform.cc @@ -349,7 +349,7 @@ static int object_clear_transform_generic_exec(bContext *C, /* run provided clearing function */ clear_func(ob, clear_delta); - blender::animrig::ED_autokeyframe_object(C, scene, ob, ks); + blender::animrig::autokeyframe_object(C, scene, ob, ks); /* tag for updates */ DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM); diff --git a/source/blender/editors/space_view3d/view3d_snap.cc b/source/blender/editors/space_view3d/view3d_snap.cc index 70975e3dbf4..cf01edc6118 100644 --- a/source/blender/editors/space_view3d/view3d_snap.cc +++ b/source/blender/editors/space_view3d/view3d_snap.cc @@ -158,7 +158,7 @@ static int snap_sel_to_grid_exec(bContext *C, wmOperator * /*op*/) } /* auto-keyframing */ - blender::animrig::ED_autokeyframe_pchan(C, scene, ob, pchan, ks); + blender::animrig::autokeyframe_pchan(C, scene, ob, pchan, ks); } /* if the bone has a parent and is connected to the parent, * don't do anything - will break chain unless we do auto-ik. @@ -238,7 +238,7 @@ static int snap_sel_to_grid_exec(bContext *C, wmOperator * /*op*/) } /* auto-keyframing */ - blender::animrig::ED_autokeyframe_object(C, scene, ob, ks); + blender::animrig::autokeyframe_object(C, scene, ob, ks); if (use_transform_data_origin) { ED_object_data_xform_container_item_ensure(xds, ob); @@ -431,7 +431,7 @@ static bool snap_selected_to_location(bContext *C, } /* auto-keyframing */ - blender::animrig::ED_autokeyframe_pchan(C, scene, ob, pchan, ks); + blender::animrig::autokeyframe_pchan(C, scene, ob, pchan, ks); } else { copy_v3_v3(pchan->loc, cursor_pose); @@ -538,7 +538,7 @@ static bool snap_selected_to_location(bContext *C, } /* auto-keyframing */ - blender::animrig::ED_autokeyframe_object(C, scene, ob, ks); + blender::animrig::autokeyframe_object(C, scene, ob, ks); } else { add_v3_v3(ob->loc, cursor_parent); diff --git a/source/blender/editors/transform/transform_convert_sequencer_image.cc b/source/blender/editors/transform/transform_convert_sequencer_image.cc index 8c3b59fe375..79a0739b015 100644 --- a/source/blender/editors/transform/transform_convert_sequencer_image.cc +++ b/source/blender/editors/transform/transform_convert_sequencer_image.cc @@ -179,23 +179,23 @@ static bool autokeyframe_sequencer_image(bContext *C, bool changed = false; if (do_rot) { prop = RNA_struct_find_property(&ptr, "rotation"); - changed |= blender::animrig::ED_autokeyframe_property( + changed |= blender::animrig::autokeyframe_property( C, scene, &ptr, prop, -1, scene->r.cfra, false); } if (do_loc) { prop = RNA_struct_find_property(&ptr, "offset_x"); - changed |= blender::animrig::ED_autokeyframe_property( + changed |= blender::animrig::autokeyframe_property( C, scene, &ptr, prop, -1, scene->r.cfra, false); prop = RNA_struct_find_property(&ptr, "offset_y"); - changed |= blender::animrig::ED_autokeyframe_property( + changed |= blender::animrig::autokeyframe_property( C, scene, &ptr, prop, -1, scene->r.cfra, false); } if (do_scale) { prop = RNA_struct_find_property(&ptr, "scale_x"); - changed |= blender::animrig::ED_autokeyframe_property( + changed |= blender::animrig::autokeyframe_property( C, scene, &ptr, prop, -1, scene->r.cfra, false); prop = RNA_struct_find_property(&ptr, "scale_y"); - changed |= blender::animrig::ED_autokeyframe_property( + changed |= blender::animrig::autokeyframe_property( C, scene, &ptr, prop, -1, scene->r.cfra, false); } diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.cc index 0e36875660a..99c821d0622 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.cc +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.cc @@ -345,7 +345,7 @@ void WM_gizmo_target_property_anim_autokey(bContext *C, Scene *scene = CTX_data_scene(C); const float cfra = float(scene->r.cfra); const int index = gz_prop->index == -1 ? 0 : gz_prop->index; - blender::animrig::ED_autokeyframe_property( + blender::animrig::autokeyframe_property( C, scene, &gz_prop->ptr, gz_prop->prop, index, cfra, false); } } -- 2.30.2 From 9dc37423e7d5b46e35dea5110cadf8ae0251ec96 Mon Sep 17 00:00:00 2001 From: Christoph Lendenfeld Date: Thu, 12 Oct 2023 16:27:05 +0200 Subject: [PATCH 2/2] reformat --- source/blender/animrig/ANIM_keyframing.hh | 1 - 1 file changed, 1 deletion(-) diff --git a/source/blender/animrig/ANIM_keyframing.hh b/source/blender/animrig/ANIM_keyframing.hh index 288131f4588..5768afd7c68 100644 --- a/source/blender/animrig/ANIM_keyframing.hh +++ b/source/blender/animrig/ANIM_keyframing.hh @@ -127,7 +127,6 @@ bool is_autokey_flag(const Scene *scene, eAutokey_Flag flag); bool autokeyframe_cfra_can_key(const Scene *scene, ID *id); void autokeyframe_object(bContext *C, Scene *scene, ViewLayer *view_layer, Object *ob, int tmode); - bool autokeyframe_object(bContext *C, Scene *scene, Object *ob, KeyingSet *ks); bool autokeyframe_pchan(bContext *C, Scene *scene, Object *ob, bPoseChannel *pchan, KeyingSet *ks); -- 2.30.2