From a2cb99fee960ad4ec9ad01ae059f38bf0e199427 Mon Sep 17 00:00:00 2001 From: Christoph Lendenfeld Date: Fri, 27 Jan 2023 13:50:02 +0100 Subject: [PATCH 1/7] implementation --- release/scripts/addons | 2 +- .../editors/animation/keyframes_general.c | 115 +++++++++++++++--- .../editors/include/ED_keyframes_edit.h | 14 +++ .../editors/space_action/action_edit.c | 5 +- .../blender/editors/space_graph/graph_edit.c | 16 ++- source/blender/makesrna/RNA_enum_items.h | 1 + 6 files changed, 131 insertions(+), 22 deletions(-) diff --git a/release/scripts/addons b/release/scripts/addons index d887a4ea6b2..9958ddb8799 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit d887a4ea6b2a9d64b926034d4e78ecf7a48ca979 +Subproject commit 9958ddb879934718cc2b379b556f0bc3b861bee5 diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c index 49e40b39902..897ffd8b4e2 100644 --- a/source/blender/editors/animation/keyframes_general.c +++ b/source/blender/editors/animation/keyframes_general.c @@ -20,12 +20,14 @@ #include "DNA_anim_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_space_types.h" #include "BKE_action.h" #include "BKE_curve.h" #include "BKE_fcurve.h" #include "BKE_main.h" #include "BKE_report.h" +#include "BKE_scene.h" #include "RNA_access.h" #include "RNA_enum_types.h" @@ -1074,7 +1076,7 @@ static void do_curve_mirror_flippping(tAnimCopybufItem *aci, BezTriple *bezt) /* helper for paste_animedit_keys() - performs the actual pasting */ static void paste_animedit_keys_fcurve( - FCurve *fcu, tAnimCopybufItem *aci, float offset, const eKeyMergeMode merge_mode, bool flip) + FCurve *fcu, tAnimCopybufItem *aci, float offset[2], const eKeyMergeMode merge_mode, bool flip) { BezTriple *bezt; int i; @@ -1101,12 +1103,12 @@ static void paste_animedit_keys_fcurve( float f_max; if (merge_mode == KEYFRAME_PASTE_MERGE_OVER_RANGE) { - f_min = aci->bezt[0].vec[1][0] + offset; - f_max = aci->bezt[aci->totvert - 1].vec[1][0] + offset; + f_min = aci->bezt[0].vec[1][0] + offset[0]; + f_max = aci->bezt[aci->totvert - 1].vec[1][0] + offset[0]; } else { /* Entire Range */ - f_min = animcopy_firstframe + offset; - f_max = animcopy_lastframe + offset; + f_min = animcopy_firstframe + offset[0]; + f_max = animcopy_lastframe + offset[0]; } /* remove keys in range */ @@ -1132,9 +1134,13 @@ static void paste_animedit_keys_fcurve( do_curve_mirror_flippping(aci, bezt); } - bezt->vec[0][0] += offset; - bezt->vec[1][0] += offset; - bezt->vec[2][0] += offset; + bezt->vec[0][0] += offset[0]; + bezt->vec[1][0] += offset[0]; + bezt->vec[2][0] += offset[0]; + + bezt->vec[0][1] += offset[1]; + bezt->vec[1][1] += offset[1]; + bezt->vec[2][1] += offset[1]; /* insert the keyframe * NOTE: we do not want to inherit handles from existing keyframes in this case! @@ -1143,9 +1149,13 @@ static void paste_animedit_keys_fcurve( insert_bezt_fcurve(fcu, bezt, INSERTKEY_OVERWRITE_FULL); /* un-apply offset from src beztriple after copying */ - bezt->vec[0][0] -= offset; - bezt->vec[1][0] -= offset; - bezt->vec[2][0] -= offset; + bezt->vec[0][0] -= offset[0]; + bezt->vec[1][0] -= offset[0]; + bezt->vec[2][0] -= offset[0]; + + bezt->vec[0][1] -= offset[1]; + bezt->vec[1][1] -= offset[1]; + bezt->vec[2][1] -= offset[1]; if (flip) { do_curve_mirror_flippping(aci, bezt); @@ -1172,6 +1182,34 @@ const EnumPropertyItem rna_enum_keyframe_paste_offset_items[] = { {0, NULL, 0, NULL, NULL}, }; +const EnumPropertyItem rna_enum_keyframe_paste_offset_value[] = { + {KEYFRAME_PASTE_VALUE_OFFSET_LEFT_KEY, + "LEFT_KEY", + 0, + "Left Key", + "Paste keys with the first key matching the key left of the cursor"}, + {KEYFRAME_PASTE_VALUE_OFFSET_RIGHT_KEY, + "RIGHT_KEY", + 0, + "Right Key", + "Paste keys with the last key matching the key right of the cursor"}, + {KEYFRAME_PASTE_VALUE_OFFSET_CFRA, + "CURRENT_FRAME", + 0, + "Current Frame Value", + "Paste keys relative to the value of the curve under the cursor"}, + {KEYFRAME_PASTE_VALUE_OFFSET_CURSOR, + "CURSOR_VALUE", + 0, + "Cursor Value", + "Paste keys relative to the Y-Position of the cursor"}, + {KEYFRAME_PASTE_VALUE_OFFSET_NONE, + "NONE", + 0, + "No Offset", + "Paste keys with the same value as they were copied"}, +}; + const EnumPropertyItem rna_enum_keyframe_paste_merge_items[] = { {KEYFRAME_PASTE_MERGE_MIX, "MIX", 0, "Mix", "Overlay existing with new keys"}, {KEYFRAME_PASTE_MERGE_OVER, "OVER_ALL", 0, "Overwrite All", "Replace all keys"}, @@ -1188,9 +1226,52 @@ const EnumPropertyItem rna_enum_keyframe_paste_merge_items[] = { {0, NULL, 0, NULL, NULL}, }; +static float paste_get_y_offset(bAnimContext *ac, + tAnimCopybufItem *aci, + bAnimListElem *ale, + const eKeyPasteValueOffset value_offset_mode) +{ + float offset; + FCurve *fcu = (FCurve *)ale->data; + const float cfra = BKE_scene_frame_get(ac->scene); + + switch (value_offset_mode) { + case KEYFRAME_PASTE_VALUE_OFFSET_CURSOR: + SpaceGraph *sipo = (SpaceGraph *)ac->sl; + offset = sipo->cursorVal - aci->bezt[0].vec[1][1]; + break; + case KEYFRAME_PASTE_VALUE_OFFSET_CFRA: + const float cfra_y = evaluate_fcurve(fcu, cfra); + offset = cfra_y - aci->bezt[0].vec[1][1]; + break; + case KEYFRAME_PASTE_VALUE_OFFSET_LEFT_KEY: { + bool replace; + const int fcu_index = BKE_fcurve_bezt_binarysearch_index( + fcu->bezt, cfra, fcu->totvert, &replace); + BezTriple left_key = fcu->bezt[max_ii(fcu_index - 1, 0)]; + offset = left_key.vec[1][1] - aci->bezt[0].vec[1][1]; + break; + } + case KEYFRAME_PASTE_VALUE_OFFSET_RIGHT_KEY: { + bool replace; + const int fcu_index = BKE_fcurve_bezt_binarysearch_index( + fcu->bezt, cfra, fcu->totvert, &replace); + BezTriple right_key = fcu->bezt[min_ii(fcu_index, fcu->totvert - 1)]; + offset = right_key.vec[1][1] - aci->bezt[aci->totvert - 1].vec[1][1]; + break; + } + case KEYFRAME_PASTE_VALUE_OFFSET_NONE: + default: + offset = 0.0f; + } + + return offset; +} + eKeyPasteError paste_animedit_keys(bAnimContext *ac, ListBase *anim_data, const eKeyPasteOffset offset_mode, + const eKeyPasteValueOffset value_offset_mode, const eKeyMergeMode merge_mode, bool flip) { @@ -1201,7 +1282,7 @@ eKeyPasteError paste_animedit_keys(bAnimContext *ac, const bool from_single = BLI_listbase_is_single(&animcopybuf); const bool to_simple = BLI_listbase_is_single(anim_data); - float offset = 0.0f; + float offset[2]; int pass; /* check if buffer is empty */ @@ -1216,16 +1297,16 @@ eKeyPasteError paste_animedit_keys(bAnimContext *ac, /* methods of offset */ switch (offset_mode) { case KEYFRAME_PASTE_OFFSET_CFRA_START: - offset = (float)(scene->r.cfra - animcopy_firstframe); + offset[0] = (float)(scene->r.cfra - animcopy_firstframe); break; case KEYFRAME_PASTE_OFFSET_CFRA_END: - offset = (float)(scene->r.cfra - animcopy_lastframe); + offset[0] = (float)(scene->r.cfra - animcopy_lastframe); break; case KEYFRAME_PASTE_OFFSET_CFRA_RELATIVE: - offset = (float)(scene->r.cfra - animcopy_cfra); + offset[0] = (float)(scene->r.cfra - animcopy_cfra); break; case KEYFRAME_PASTE_OFFSET_NONE: - offset = 0.0f; + offset[0] = 0.0f; break; } @@ -1238,6 +1319,7 @@ eKeyPasteError paste_animedit_keys(bAnimContext *ac, fcu = (FCurve *)ale->data; /* destination F-Curve */ aci = animcopybuf.first; + offset[1] = paste_get_y_offset(ac, aci, ale, value_offset_mode); paste_animedit_keys_fcurve(fcu, aci, offset, merge_mode, false); ale->update |= ANIM_UPDATE_DEFAULT; } @@ -1282,6 +1364,7 @@ eKeyPasteError paste_animedit_keys(bAnimContext *ac, if (aci) { totmatch++; + offset[1] = paste_get_y_offset(ac, aci, ale, value_offset_mode); if (adt) { ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 0, 0); paste_animedit_keys_fcurve(fcu, aci, offset, merge_mode, flip); diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h index f027a46b470..5bd672072b1 100644 --- a/source/blender/editors/include/ED_keyframes_edit.h +++ b/source/blender/editors/include/ED_keyframes_edit.h @@ -218,6 +218,19 @@ typedef enum eKeyPasteOffset { KEYFRAME_PASTE_OFFSET_NONE, } eKeyPasteOffset; +typedef enum eKeyPasteValueOffset { + /* Paste keys with the first key matching the key left of the cursor. */ + KEYFRAME_PASTE_VALUE_OFFSET_LEFT_KEY, + /* Paste keys with the last key matching the key right of the cursor. */ + KEYFRAME_PASTE_VALUE_OFFSET_RIGHT_KEY, + /* Paste keys relative to the value of the curve under the cursor. */ + KEYFRAME_PASTE_VALUE_OFFSET_CFRA, + /* Paste values relative to the cursor position. */ + KEYFRAME_PASTE_VALUE_OFFSET_CURSOR, + /* Paste keys with the exact copied value. */ + KEYFRAME_PASTE_VALUE_OFFSET_NONE, +} eKeyPasteValueOffset; + typedef enum eKeyMergeMode { /* overlay existing with new keys */ KEYFRAME_PASTE_MERGE_MIX, @@ -427,6 +440,7 @@ short copy_animedit_keys(struct bAnimContext *ac, ListBase *anim_data); eKeyPasteError paste_animedit_keys(struct bAnimContext *ac, ListBase *anim_data, eKeyPasteOffset offset_mode, + eKeyPasteValueOffset value_offset_mode, eKeyMergeMode merge_mode, bool flip); diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index 4c1a86a88e3..55657da55d2 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -533,8 +533,9 @@ static eKeyPasteError paste_action_keys(bAnimContext *ac, ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype); } - /* paste keyframes */ - const eKeyPasteError ok = paste_animedit_keys(ac, &anim_data, offset_mode, merge_mode, flip); + /* Value offset is always None because the user cannot see the effect of it. */ + const eKeyPasteError ok = paste_animedit_keys( + ac, &anim_data, offset_mode, KEYFRAME_PASTE_VALUE_OFFSET_NONE, merge_mode, flip); /* clean up */ ANIM_animdata_freelist(&anim_data); diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index 1ad68eef2f5..97ef0326cbf 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -475,6 +475,7 @@ static short copy_graph_keys(bAnimContext *ac) static eKeyPasteError paste_graph_keys(bAnimContext *ac, const eKeyPasteOffset offset_mode, + const eKeyPasteValueOffset value_offset_mode, const eKeyMergeMode merge_mode, bool flip) { @@ -495,7 +496,8 @@ static eKeyPasteError paste_graph_keys(bAnimContext *ac, } /* Paste keyframes. */ - const eKeyPasteError ok = paste_animedit_keys(ac, &anim_data, offset_mode, merge_mode, flip); + const eKeyPasteError ok = paste_animedit_keys( + ac, &anim_data, offset_mode, value_offset_mode, merge_mode, flip); /* Clean up. */ ANIM_animdata_freelist(&anim_data); @@ -544,6 +546,7 @@ static int graphkeys_paste_exec(bContext *C, wmOperator *op) bAnimContext ac; const eKeyPasteOffset offset_mode = RNA_enum_get(op->ptr, "offset"); + const eKeyPasteValueOffset value_offset_mode = RNA_enum_get(op->ptr, "value_offset"); const eKeyMergeMode merge_mode = RNA_enum_get(op->ptr, "merge"); const bool flipped = RNA_boolean_get(op->ptr, "flipped"); @@ -555,7 +558,8 @@ static int graphkeys_paste_exec(bContext *C, wmOperator *op) /* Ac.reports by default will be the global reports list, which won't show warnings. */ ac.reports = op->reports; - const eKeyPasteError kf_empty = paste_graph_keys(&ac, offset_mode, merge_mode, flipped); + const eKeyPasteError kf_empty = paste_graph_keys( + &ac, offset_mode, value_offset_mode, merge_mode, flipped); switch (kf_empty) { case KEYFRAME_PASTE_OK: break; @@ -614,8 +618,14 @@ void GRAPH_OT_paste(wmOperatorType *ot) "offset", rna_enum_keyframe_paste_offset_items, KEYFRAME_PASTE_OFFSET_CFRA_START, - "Offset", + "Frame Offset", "Paste time offset of keys"); + RNA_def_enum(ot->srna, + "value_offset", + rna_enum_keyframe_paste_offset_value, + KEYFRAME_PASTE_VALUE_OFFSET_NONE, + "Value Offset", + "Paste keys with a value offset"); RNA_def_enum(ot->srna, "merge", rna_enum_keyframe_paste_merge_items, diff --git a/source/blender/makesrna/RNA_enum_items.h b/source/blender/makesrna/RNA_enum_items.h index bc4d9282af0..510469c2756 100644 --- a/source/blender/makesrna/RNA_enum_items.h +++ b/source/blender/makesrna/RNA_enum_items.h @@ -242,6 +242,7 @@ DEF_ENUM(rna_enum_particle_edit_hair_brush_items) DEF_ENUM(rna_enum_particle_edit_disconnected_hair_brush_items) DEF_ENUM(rna_enum_keyframe_paste_offset_items) +DEF_ENUM(rna_enum_keyframe_paste_offset_value) DEF_ENUM(rna_enum_keyframe_paste_merge_items) DEF_ENUM(rna_enum_transform_pivot_items_full) -- 2.30.2 From f0fa2eca0e6038ea2370bb72bcdcfa4b33db49b1 Mon Sep 17 00:00:00 2001 From: Christoph Lendenfeld Date: Thu, 16 Feb 2023 17:16:15 +0100 Subject: [PATCH 2/7] implement sybrens feedback --- .../editors/animation/keyframes_general.c | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c index 20005e8fd94..61addd217ef 100644 --- a/source/blender/editors/animation/keyframes_general.c +++ b/source/blender/editors/animation/keyframes_general.c @@ -1134,13 +1134,9 @@ static void paste_animedit_keys_fcurve( do_curve_mirror_flippping(aci, bezt); } - bezt->vec[0][0] += offset[0]; - bezt->vec[1][0] += offset[0]; - bezt->vec[2][0] += offset[0]; - - bezt->vec[0][1] += offset[1]; - bezt->vec[1][1] += offset[1]; - bezt->vec[2][1] += offset[1]; + add_v2_v2(bezt->vec[0], offset); + add_v2_v2(bezt->vec[1], offset); + add_v2_v2(bezt->vec[2], offset); /* insert the keyframe * NOTE: we do not want to inherit handles from existing keyframes in this case! @@ -1149,13 +1145,9 @@ static void paste_animedit_keys_fcurve( insert_bezt_fcurve(fcu, bezt, INSERTKEY_OVERWRITE_FULL); /* un-apply offset from src beztriple after copying */ - bezt->vec[0][0] -= offset[0]; - bezt->vec[1][0] -= offset[0]; - bezt->vec[2][0] -= offset[0]; - - bezt->vec[0][1] -= offset[1]; - bezt->vec[1][1] -= offset[1]; - bezt->vec[2][1] -= offset[1]; + sub_v2_v2(bezt->vec[0], offset); + sub_v2_v2(bezt->vec[1], offset); + sub_v2_v2(bezt->vec[2], offset); if (flip) { do_curve_mirror_flippping(aci, bezt); @@ -1239,33 +1231,37 @@ static float paste_get_y_offset(bAnimContext *ac, case KEYFRAME_PASTE_VALUE_OFFSET_CURSOR: SpaceGraph *sipo = (SpaceGraph *)ac->sl; offset = sipo->cursorVal - aci->bezt[0].vec[1][1]; - break; + return offset; + case KEYFRAME_PASTE_VALUE_OFFSET_CFRA: const float cfra_y = evaluate_fcurve(fcu, cfra); offset = cfra_y - aci->bezt[0].vec[1][1]; - break; + return offset; + case KEYFRAME_PASTE_VALUE_OFFSET_LEFT_KEY: { bool replace; const int fcu_index = BKE_fcurve_bezt_binarysearch_index( fcu->bezt, cfra, fcu->totvert, &replace); BezTriple left_key = fcu->bezt[max_ii(fcu_index - 1, 0)]; offset = left_key.vec[1][1] - aci->bezt[0].vec[1][1]; - break; + return offset; } + case KEYFRAME_PASTE_VALUE_OFFSET_RIGHT_KEY: { bool replace; const int fcu_index = BKE_fcurve_bezt_binarysearch_index( fcu->bezt, cfra, fcu->totvert, &replace); BezTriple right_key = fcu->bezt[min_ii(fcu_index, fcu->totvert - 1)]; offset = right_key.vec[1][1] - aci->bezt[aci->totvert - 1].vec[1][1]; - break; + return offset; } + case KEYFRAME_PASTE_VALUE_OFFSET_NONE: default: - offset = 0.0f; + break; } - return offset; + return 0.0f; } eKeyPasteError paste_animedit_keys(bAnimContext *ac, -- 2.30.2 From ee48094cb8eb70e7968c7e761fedac14d89a3849 Mon Sep 17 00:00:00 2001 From: Christoph Lendenfeld Date: Fri, 17 Feb 2023 15:37:43 +0100 Subject: [PATCH 3/7] implement sybrens comments --- release/datafiles/locale | 2 +- release/scripts/addons | 2 +- release/scripts/addons_contrib | 2 +- .../editors/animation/keyframes_general.c | 16 ++++++++-------- source/tools | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/release/datafiles/locale b/release/datafiles/locale index 4331c8e76c2..8d04896a130 160000 --- a/release/datafiles/locale +++ b/release/datafiles/locale @@ -1 +1 @@ -Subproject commit 4331c8e76c2f42b9fd903716c333d6cdeaa5cebd +Subproject commit 8d04896a130c12eb440b7b9ac33bf9dc152506b5 diff --git a/release/scripts/addons b/release/scripts/addons index b3f0ffc587d..7eef98cbe58 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit b3f0ffc587d197b37eac9a1566d1d24b7bee7d9a +Subproject commit 7eef98cbe5899b5b9011603cb59632cb5105de2e diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib index 14ab9273409..2f5e03e7648 160000 --- a/release/scripts/addons_contrib +++ b/release/scripts/addons_contrib @@ -1 +1 @@ -Subproject commit 14ab9273409ea0231d08ba6e86fdc73d4e459e99 +Subproject commit 2f5e03e764898c249029bc0ade52f7928555b267 diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c index 61addd217ef..f23f124b3cb 100644 --- a/source/blender/editors/animation/keyframes_general.c +++ b/source/blender/editors/animation/keyframes_general.c @@ -1223,27 +1223,28 @@ static float paste_get_y_offset(bAnimContext *ac, bAnimListElem *ale, const eKeyPasteValueOffset value_offset_mode) { - float offset; FCurve *fcu = (FCurve *)ale->data; const float cfra = BKE_scene_frame_get(ac->scene); switch (value_offset_mode) { - case KEYFRAME_PASTE_VALUE_OFFSET_CURSOR: + case KEYFRAME_PASTE_VALUE_OFFSET_CURSOR: { SpaceGraph *sipo = (SpaceGraph *)ac->sl; - offset = sipo->cursorVal - aci->bezt[0].vec[1][1]; + const float offset = sipo->cursorVal - aci->bezt[0].vec[1][1]; return offset; + } - case KEYFRAME_PASTE_VALUE_OFFSET_CFRA: + case KEYFRAME_PASTE_VALUE_OFFSET_CFRA: { const float cfra_y = evaluate_fcurve(fcu, cfra); - offset = cfra_y - aci->bezt[0].vec[1][1]; + const float offset = cfra_y - aci->bezt[0].vec[1][1]; return offset; + } case KEYFRAME_PASTE_VALUE_OFFSET_LEFT_KEY: { bool replace; const int fcu_index = BKE_fcurve_bezt_binarysearch_index( fcu->bezt, cfra, fcu->totvert, &replace); BezTriple left_key = fcu->bezt[max_ii(fcu_index - 1, 0)]; - offset = left_key.vec[1][1] - aci->bezt[0].vec[1][1]; + const float offset = left_key.vec[1][1] - aci->bezt[0].vec[1][1]; return offset; } @@ -1252,12 +1253,11 @@ static float paste_get_y_offset(bAnimContext *ac, const int fcu_index = BKE_fcurve_bezt_binarysearch_index( fcu->bezt, cfra, fcu->totvert, &replace); BezTriple right_key = fcu->bezt[min_ii(fcu_index, fcu->totvert - 1)]; - offset = right_key.vec[1][1] - aci->bezt[aci->totvert - 1].vec[1][1]; + const float offset = right_key.vec[1][1] - aci->bezt[aci->totvert - 1].vec[1][1]; return offset; } case KEYFRAME_PASTE_VALUE_OFFSET_NONE: - default: break; } diff --git a/source/tools b/source/tools index e133fc08cd3..27826b4aed1 160000 --- a/source/tools +++ b/source/tools @@ -1 +1 @@ -Subproject commit e133fc08cd3254bb3d3bd1345028c8486700bca4 +Subproject commit 27826b4aed138b7e3aed882d0eab96740c3a55c7 -- 2.30.2 From 4e7d80c6047fdfcfe1284036ef7cba648a6b25d2 Mon Sep 17 00:00:00 2001 From: Christoph Lendenfeld Date: Fri, 17 Feb 2023 16:18:36 +0100 Subject: [PATCH 4/7] undoing the submodule bump --- release/datafiles/locale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/datafiles/locale b/release/datafiles/locale index 8d04896a130..4331c8e76c2 160000 --- a/release/datafiles/locale +++ b/release/datafiles/locale @@ -1 +1 @@ -Subproject commit 8d04896a130c12eb440b7b9ac33bf9dc152506b5 +Subproject commit 4331c8e76c2f42b9fd903716c333d6cdeaa5cebd -- 2.30.2 From a194cc1323b929f92ad3b0dc709ac9a82aa75d20 Mon Sep 17 00:00:00 2001 From: Christoph Lendenfeld Date: Fri, 17 Feb 2023 16:24:57 +0100 Subject: [PATCH 5/7] undoing the submodule bump --- release/scripts/addons | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/scripts/addons b/release/scripts/addons index 7eef98cbe58..b3f0ffc587d 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit 7eef98cbe5899b5b9011603cb59632cb5105de2e +Subproject commit b3f0ffc587d197b37eac9a1566d1d24b7bee7d9a -- 2.30.2 From deb030b62c17a5751f94e7870e2254c4f7f64536 Mon Sep 17 00:00:00 2001 From: Christoph Lendenfeld Date: Fri, 17 Feb 2023 16:25:12 +0100 Subject: [PATCH 6/7] undoing the submodule bump --- release/scripts/addons_contrib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib index 2f5e03e7648..14ab9273409 160000 --- a/release/scripts/addons_contrib +++ b/release/scripts/addons_contrib @@ -1 +1 @@ -Subproject commit 2f5e03e764898c249029bc0ade52f7928555b267 +Subproject commit 14ab9273409ea0231d08ba6e86fdc73d4e459e99 -- 2.30.2 From 777b82b0f398844f37b70997ce21a8fb11425f2d Mon Sep 17 00:00:00 2001 From: Christoph Lendenfeld Date: Fri, 17 Feb 2023 16:25:40 +0100 Subject: [PATCH 7/7] undoing the submodule bump --- source/tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/tools b/source/tools index 27826b4aed1..e133fc08cd3 160000 --- a/source/tools +++ b/source/tools @@ -1 +1 @@ -Subproject commit 27826b4aed138b7e3aed882d0eab96740c3a55c7 +Subproject commit e133fc08cd3254bb3d3bd1345028c8486700bca4 -- 2.30.2