tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

GPv3: Assert drawing before first frame 

Assert at `BLI_assert(active_layer.has_drawing_at(current_frame))`
New keyframe is not added when brush draws on a frame which is before
the first frame that actually contains the drawing.

Pull Request: https://projects.blender.org/blender/blender/pulls/117983
This commit is contained in:
Pratik Borhade 2024-02-09 10:48:23 +01:00 committed by Pratik Borhade
parent e20b2d2fb9
commit 69e0e9f19f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc
View File

@ -167,9 +167,12 @@ static int grease_pencil_brush_stroke_invoke(bContext *C, wmOperator *op, const
/* If auto-key is on and the drawing at the current frame starts before the current frame a new
* keyframe needs to be inserted. */
if (blender::animrig::is_autokey_on(scene) && active_layer.frame_key_at(current_frame) &&
*active_layer.frame_key_at(current_frame) < current_frame)
{
const bool is_first = active_layer.sorted_keys().is_empty() ||
(active_layer.sorted_keys().first() > current_frame);
const bool needs_new_drawing = is_first ||
(*active_layer.frame_key_at(current_frame) < current_frame);
if (blender::animrig::is_autokey_on(scene) && needs_new_drawing) {
const ToolSettings *ts = CTX_data_tool_settings(C);
if ((ts->gpencil_flags & GP_TOOL_FLAG_RETAIN_LAST) != 0) {
/* For additive drawing, we duplicate the frame that's currently visible and insert it at the