Fix: Regression: Box select not working for GP/GPv3 channels #111377

Merged
Pratik Borhade merged 2 commits from PratikPB2123/blender:gpv3-box-select into main 2023-09-11 14:22:57 +02:00
Member

Caused by 62d9e55eec
Grease pencil channels are not added to the anim_data list when
ANIMFILTER_FCURVESONLY is set. So consider this filter only when
animation data is Fcurve.

Caused by 62d9e55eec4d28a6e0c927f7a327e18acac1ad32 Grease pencil channels are not added to the `anim_data` list when `ANIMFILTER_FCURVESONLY` is set. So consider this filter only when animation data is Fcurve.
Pratik Borhade added 1 commit 2023-08-22 13:34:32 +02:00
876a0ff702 Fix: Regression: Box select not working for GP/GPv3 channels
Caused by 62d9e55eec
Grease pencil channels are not added to the `anim_data` list when
`ANIMFILTER_FCURVESONLY` is set. So consider this filter only when
animation data is Fcurve.
Pratik Borhade requested review from Sybren A. Stüvel 2023-08-22 13:34:41 +02:00
Pratik Borhade added the
Module
Animation & Rigging
label 2023-08-22 13:34:51 +02:00
Pratik Borhade added this to the Animation & Rigging project 2023-08-22 13:34:56 +02:00
Pratik Borhade added this to the 3.6 LTS milestone 2023-09-08 12:14:00 +02:00
Sybren A. Stüvel added the
Interest
Grease Pencil
label 2023-09-08 13:02:53 +02:00
Sybren A. Stüvel requested review from Amélie Fondevilla 2023-09-08 13:03:01 +02:00
Sybren A. Stüvel approved these changes 2023-09-08 13:03:25 +02:00
Sybren A. Stüvel left a comment
Member

It looks good to me, but I want @amelief 's eyes on this for the final call.

It looks good to me, but I want @amelief 's eyes on this for the final call.

Hey,
I think we can directly use the function : ANIM_animdata_can_have_greasepencil that checks if a container can have grease pencil channels in it.

Hey, I think we can directly use the function : `ANIM_animdata_can_have_greasepencil` that checks if a container can have grease pencil channels in it.
Author
Member

Hi, I doubt the use of ANIM_animdata_can_have_greasepencil here. Actual problem is due to wrong filter flag.
Grease pencil channels are skipped when ANIMFILTER_FCURVESONLY is used (which is added in 62d9e55eec)


In case I've failed to explain bug properly, here are steps to replicate it:

  • Open default 2D animation file
  • In Dopesheet area where channels are located, draw box select. (nothing is selected :) )
Hi, I doubt the use of `ANIM_animdata_can_have_greasepencil` here. Actual problem is due to wrong `filter flag`. Grease pencil channels are skipped when [ANIMFILTER_FCURVESONLY is used](https://projects.blender.org/blender/blender/src/branch/main/source/blender/editors/animation/anim_filter.cc#L1937) (which is added in 62d9e55eec4d28a6e0c927f7a327e18acac1ad32) - - - In case I've failed to explain bug properly, here are steps to replicate it: - Open default 2D animation file - In Dopesheet area where channels are located, draw box select. (nothing is selected :) )
Amélie Fondevilla reviewed 2023-09-11 09:54:34 +02:00
@ -2933,1 +2932,3 @@
ANIMFILTER_FCURVESONLY);
filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
if (ac->datatype == ANIMCONT_FCURVES) {

To me this line can be changed to
if (!ANIM_animdata_can_have_greasepencil(eAnimCont_Types(ac->datatype))) {

This way we only apply the Fcurves only filter in containers that does not contain grease pencil data (including but not restricted to ANIMCONT_FCURVES).

(Sorry, my first message was not very clear.)

To me this line can be changed to `if (!ANIM_animdata_can_have_greasepencil(eAnimCont_Types(ac->datatype))) {` This way we only apply the Fcurves only filter in containers that does not contain grease pencil data (including but not restricted to `ANIMCONT_FCURVES`). (Sorry, my first message was not very clear.)
Author
Member

oh, right. I thought this would re-introduce the bug fixed in 62d9e55eec

oh, right. I thought this would re-introduce the bug fixed in 62d9e55eec4d28a6e0c927f7a327e18acac1ad32
Pratik Borhade added 1 commit 2023-09-11 12:01:12 +02:00
Amélie Fondevilla approved these changes 2023-09-11 13:55:18 +02:00
Pratik Borhade merged commit a370acae0c into main 2023-09-11 14:22:57 +02:00
Pratik Borhade deleted branch gpv3-box-select 2023-09-11 14:22:59 +02:00
Author
Member

Merged, thanks for reviewing :)

Merged, thanks for reviewing :)
Sign in to join this conversation.
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser Project (Legacy)
Interest
Asset System
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
No Milestone
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#111377
No description provided.