From 2529aa65849c6466fa780f6accd5facf5f80e6a2 Mon Sep 17 00:00:00 2001 From: Falk David Date: Mon, 6 Nov 2023 12:29:33 +0100 Subject: [PATCH] GPv3: Include current frame in multi-frame editing When enabling multi-frame editing, also include the current frame as editable. Not just the selected frames in the dopesheet. This was a regression introduced in #114283. --- .../grease_pencil/intern/grease_pencil_utils.cc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_utils.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_utils.cc index 4cc61df74a1..c599d329742 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_utils.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_utils.cc @@ -77,16 +77,15 @@ float brush_radius_world_space(bContext &C, int x, int y) } static Array get_frame_numbers_for_layer(const bke::greasepencil::Layer &layer, - const int frame, + const int current_frame, const bool use_multi_frame_editing) { - if (!use_multi_frame_editing) { - return Array({frame}); - } - Vector frame_numbers; - for (const auto [frame_number, frame] : layer.frames().items()) { - if (frame.is_selected()) { - frame_numbers.append_unchecked(frame_number); + Vector frame_numbers({current_frame}); + if (use_multi_frame_editing) { + for (const auto [frame_number, frame] : layer.frames().items()) { + if (frame.is_selected()) { + frame_numbers.append_unchecked(frame_number); + } } } return frame_numbers.as_span();