GPv3: Select box grease pencil frames #110939

Merged

Amélie Fondevilla merged 4 commits from Chao-Li/blender:110522 into main

2023-08-16 11:44:23 +02:00

Chao Li commented

2023-08-09 03:05:43 +02:00

Contributor

Adapt the ACTION_OT_select_leftright, ACTION_OT_select_box and ACTION_OT_select_column operators to take into account grease pencil layer channels. These operators call actkeys_select_leftright, box_select_elem, and markers_selectkeys_between, respectively. In these three functions, grease pencil layer channels are considered now. This resolves #110522.

Adapt the `ACTION_OT_select_leftright`, `ACTION_OT_select_box` and `ACTION_OT_select_column` operators to take into account grease pencil layer channels. These operators call `actkeys_select_leftright`, `box_select_elem`, and `markers_selectkeys_between`, respectively. In these three functions, grease pencil layer channels are considered now. This resolves #110522.

Chao Li force-pushed 110522 from d835cdb855 to 182484666b

2023-08-09 03:07:28 +02:00

Compare

Iliya Katushenock added the

label 2023-08-09 16:47:56 +02:00

Amélie Fondevilla added this to the Grease Pencil project 2023-08-11 09:35:06 +02:00

Amélie Fondevilla requested review from Amélie Fondevilla 2023-08-11 09:43:13 +02:00

Amélie Fondevilla commented

2023-08-11 09:48:07 +02:00

Member

Hi @Chao-Li ,
Sorry, I only noticed this PR today. Thanks for the patch, the code looks good to me !

We recently added grease pencil object summaries in the dopesheet (d5b2960a07), so we need to also account for them in the operators.

I will leave a comment in the code to point were things should be added.
You may also want to rebase the branch to get the current state of the main branch to be able to test and select those summary keyframes.

Hi @Chao-Li , Sorry, I only noticed this PR today. Thanks for the patch, the code looks good to me ! We recently added grease pencil object summaries in the dopesheet (https://projects.blender.org/blender/blender/commit/d5b2960a07c9073d675912ef64252e0da4ebf48e), so we need to also account for them in the operators. I will leave a comment in the code to point were things should be added. You may also want to rebase the branch to get the current state of the main branch to be able to test and select those summary keyframes.

Amélie Fondevilla requested changes 2023-08-11 09:57:52 +02:00

source/blender/editors/space_action/action_select.cc Outdated

						
				@ -431,0 +433,4 @@

				          static_cast<GreasePencilLayer *>(ale->data)->wrap(), xmin, xmax, sel_data->selectmode);

				      ale->update |= ANIM_UPDATE_DEPS;

				      break;

				    }

Amélie Fondevilla commented

2023-08-11 09:55:39 +02:00

Member

Here, we need to add a case for ANIMTYPE_GREASE_PENCIL_DATABLOCK, in which we loop over all the layers of the grease pencil object, and call select_frame_box on the layer.
Note: if ale->type == ANIMTYPE_GREASE_PENCIL_DATABLOCK, then ale->data can be casted to a GreasePencil structure.

Here, we need to add a case for `ANIMTYPE_GREASE_PENCIL_DATABLOCK`, in which we loop over all the layers of the grease pencil object, and call `select_frame_box` on the layer. Note: if `ale->type == ANIMTYPE_GREASE_PENCIL_DATABLOCK`, then `ale->data` can be casted to a `GreasePencil` structure.

Chao-Li marked this conversation as resolved

Amélie Fondevilla referenced this pull request

2023-08-11 09:58:39 +02:00

GPv3: Integration in the Dopesheets #110056

Falk David requested changes 2023-08-14 13:02:33 +02:00

Falk David left a comment

Member

One comment from me :)

One comment from me :)

source/blender/editors/grease_pencil/intern/grease_pencil_frames.cc Outdated

						
				@ -108,6 +109,19 @@ void select_frames_region(KeyframeEditData *ked,

				  }

				}

				void select_frames_box(bke::greasepencil::Layer &layer,

Falk David commented

2023-08-14 13:01:42 +02:00

Member

I'd name this select_frames_range, since we're not selecting in a rectangle/box here.

I'd name this `select_frames_range`, since we're not selecting in a rectangle/box here.

Chao-Li marked this conversation as resolved

Chao Li added 2 commits 2023-08-16 03:13:40 +02:00

2970221428 Merge branch 'main' into 110522

abc262b852 Rename select_frames_box to select_frames_range

Chao Li added 1 commit 2023-08-16 04:11:14 +02:00

bdf079bf68 ACTION_OT_select_box takes into consideration grease pencil summary channel

Falk David approved these changes 2023-08-16 11:34:24 +02:00

Falk David left a comment

Member

Looks good to me :)

Looks good to me :)

Amélie Fondevilla approved these changes 2023-08-16 11:43:29 +02:00

Amélie Fondevilla merged commit 27eb6d48d3 into main

2023-08-16 11:44:23 +02:00

Amélie Fondevilla referenced this issue from a commit

2023-08-16 11:44:24 +02:00

GPv3: Select box grease pencil frames

Sign in to join this conversation.

No reviewers

No Label

Animation & Rigging

Asset Browser Project Overview

Automated Testing

Blender Asset Bundle

Dependency Graph

Development Management

EEVEE & Viewport

Images & Movies

Motion Tracking

Nodes & Physics

Pipeline, Assets & IO

Platforms, Builds & Tests

Render & Cycles

Render Pipeline

Sculpt, Paint & Texture

Video Sequencer

Virtual Reality

Blender 2.8 Project

Milestone 1: Basic, Local Asset Browser

Good First Issue

Animation & Rigging

Development Management

EEVEE & Viewport

Nodes & Physics

Pipeline, Assets & IO

Platforms, Builds & Tests

Render & Cycles

Sculpt, Paint & Texture

Needs Info from Developers

Needs Information from User

No Milestone

No project

No Assignees

3 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#110939

No description provided.