blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 759 Projects 19 Wiki Activity

GPv3: Display layers in dopesheet and timeline #120605

Open
Pratik Borhade wants to merge 5 commits from PratikPB2123/blender:gpv3-channels-in-dopesheet into main
pull from: PratikPB2123/blender:gpv3-channels-in-dopesheet
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 6 Commits 5 Files Changed 3 +21 -5
Pratik Borhade commented 2024-04-13 10:53:31 +02:00
Member
Copy Link

Include GPv3 layers in dopesheet and timeline editor.
Call animdata_filter_grease_pencil_data in animdata_filter_dopesheet_ob
to draw layers. Key transform was crashing due to missing recalculation which
is also handled in this PR.
Part of #110056

GPv2 GPv3
Dopesheet gpv2-dopesheet gpv3-dopesheet
Timeline gpv2-timeline gpv3-timeline
Include GPv3 layers in dopesheet and timeline editor. Call `animdata_filter_grease_pencil_data` in `animdata_filter_dopesheet_ob` to draw layers. Key transform was crashing due to missing recalculation which is also handled in this PR. Part of #110056 | | GPv2 | GPv3 | | -- | -- | -- | | Dopesheet | ![gpv2-dopesheet](/attachments/9b920a56-935c-4be1-a85c-da565532fb68) | ![gpv3-dopesheet](/attachments/cd8115c0-8202-46f6-9a25-6575c33edd0d) | | Timeline | ![gpv2-timeline](/attachments/264752c6-dc01-4628-8e72-a63889e80f87) | ![gpv3-timeline](/attachments/4bf9ec3c-eb7e-4466-8b90-f61d8c6aafc9) |
gpv2-timeline.png
42 KiB
gpv3-timeline.png
43 KiB
gpv2-dopesheet.png
73 KiB
gpv2-dopesheet.png
73 KiB
gpv3-dopesheet.png
73 KiB
gpv2-dopesheet.png
Pratik Borhade added 1 commit 2024-04-13 10:53:42 +02:00
a04c839ff0 GPv3: Display layers in dopesheet and timeline 
Include gpv3 layers in dopesheet and timeline editor.
Part of #110056
Pratik Borhade added 1 commit 2024-04-13 10:54:56 +02:00
Pratik Borhade added 1 commit 2024-04-13 10:57:18 +02:00
Pratik Borhade requested review from Falk David 2024-04-13 10:58:22 +02:00
Pratik Borhade requested review from Amélie Fondevilla 2024-04-13 10:58:22 +02:00
Pratik Borhade added this to the Grease Pencil project 2024-04-13 10:58:30 +02:00
Pratik Borhade added the
Module
Grease Pencil
 label 2024-04-13 10:58:39 +02:00
Pratik Borhade requested review from Sybren A. Stüvel 2024-04-15 11:50:21 +02:00
Amélie Fondevilla commented 2024-04-16 14:29:06 +02:00
Member
Copy Link

hi @PratikPB2123 ,
thanks for the PR.

I think this integration should also come with the support of basic operators, at least to avoid crashes.
For example, right now, if I try to move a grease pencil keyframe in the main dopesheet, Blender crashes.

You can go through the TODO list I made for operations in the grease pencil dopesheet (#110056) to check if everything works properly. Again, I think it's okay if not everything is implemented, but we should avoid crashes.

hi @PratikPB2123 , thanks for the PR. I think this integration should also come with the support of basic operators, at least to avoid crashes. For example, right now, if I try to move a grease pencil keyframe in the main dopesheet, Blender crashes. You can go through the TODO list I made for operations in the grease pencil dopesheet (#110056) to check if everything works properly. Again, I think it's okay if not everything is implemented, but we should avoid crashes.
👍 1
Pratik Borhade added 1 commit 2024-04-17 13:27:32 +02:00
Pratik Borhade added 1 commit 2024-04-18 10:39:32 +02:00
Pratik Borhade commented 2024-04-18 10:46:13 +02:00
Author
Member
Copy Link

@amelief hi, thanks for the review. Made few changes, now it's not crashing when transforming gpv3 layer keys.
I checked few other operations and they are already working correctly 🙂

@amelief hi, thanks for the review. Made few changes, now it's not crashing when transforming gpv3 layer keys. I checked few other operations and they are already working correctly 🙂
Sybren A. Stüvel commented 2024-04-22 14:34:23 +02:00
Member
Copy Link

Please extend this PR so that it adheres better to the guidelines. For changes like this, I would at least expect some screenshots of what these layers are supposed to look like in the dopesheet and in the timeline.

Please extend this PR so that it adheres better to [the guidelines](https://developer.blender.org/docs/handbook/contributing/#guidelines). For changes like this, I would at least expect some screenshots of what these layers are supposed to look like in the dopesheet and in the timeline.
Pratik Borhade commented 2024-04-23 13:05:04 +02:00
Author
Member
Copy Link

what these layers are supposed to look like in the dopesheet and in the timeline.

@dr.sybren hi, they look same as legacy GP layers. I've added screenshots in description 🙂

> what these layers are supposed to look like in the dopesheet and in the timeline. @dr.sybren hi, they look same as legacy GP layers. I've added screenshots in description 🙂
Falk David commented 2024-04-26 15:22:07 +02:00
Member
Copy Link

@PratikPB2123 I think in this case, a before/after image for GPv3 would have been better 😅

Something like:

Timeline Dopesheet
GPv2 ... ...
GPv3 before ... ...
GPv3 after ... ...
@PratikPB2123 I think in this case, a before/after image for GPv3 would have been better 😅 Something like: | | Timeline | Dopesheet | | --- | --- | --- | | GPv2 | ... | ... | | GPv3 before | ... | ... | | GPv3 after | ... | ... |
Pratik Borhade commented 2024-04-26 19:03:53 +02:00
Author
Member
Copy Link

GPv3 before: nothing to show really. Before this PR, layers (and gpv3 keys) were not added in dopesheet/timeline so it's empty basically 😅

`GPv3 before`: nothing to show really. Before this PR, layers (and gpv3 keys) were not added in dopesheet/timeline so it's empty basically 😅
Falk David approved these changes 2024-04-29 18:05:36 +02:00
Falk David left a comment
Member
Copy Link

Code looks good to me. Also tested this locally and seems to work well.

Code looks good to me. Also tested this locally and seems to work well.
👍 1
Sybren A. Stüvel reviewed 2024-05-02 11:35:15 +02:00
Sybren A. Stüvel left a comment
Member
Copy Link

I've added screenshots in description 🙂

Thanks.

@dr.sybren hi, they look same as legacy GP layers.

It would seem they're subtly different. The indentation isn't as it was, and also the colour is different. If it's supposed to be the same, there's some work to do.

> I've added screenshots in description 🙂 Thanks. > @dr.sybren hi, they look same as legacy GP layers. It would seem they're subtly different. The indentation isn't as it was, and also the colour is different. If it's supposed to be the same, there's some work to do.
source/blender/editors/transform/transform_convert_action.cc
@ -999,3 +999,3 @@
}
if (ac.datatype == ANIMCONT_GPENCIL) {
{
Sybren A. Stüvel commented 2024-05-02 11:35:04 +02:00
Member
Copy Link

What's the reasoning behind this change? It's not immediately clear to me why it's ok to remove this condition.

What's the reasoning behind this change? It's not immediately clear to me why it's ok to remove this condition.
Pratik Borhade commented 2024-05-02 14:37:25 +02:00
Author
Member
Copy Link

To call grease_pencil_layer_reset_trans_data. Earlier it was only done for grease pencil dopesheet mode. After removing the check, fucntion will be called for normal dopesheet/timeline as well.

On phone btw but I'm sure this is the reason.

To call `grease_pencil_layer_reset_trans_data`. Earlier it was only done for grease pencil dopesheet mode. After removing the check, fucntion will be called for normal dopesheet/timeline as well. On phone btw but I'm sure this is the reason.
Merge conflict checking is in progress. Try again in few moments.
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u gpv3-channels-in-dopesheet:PratikPB2123-gpv3-channels-in-dopesheet
git checkout PratikPB2123-gpv3-channels-in-dopesheet
Sign in to join this conversation.
Reviewers
No reviewers
Amélie Fondevilla
Sybren A. Stüvel
Falk David
Labels
Clear labels   
Interest
Alembic

  
Interest
Animation & Rigging

  
Interest
Asset Browser

  
Interest
Asset Browser Project Overview

  
Interest
Audio

  
Interest
Automated Testing

  
Interest
Blender Asset Bundle

  
Interest
BlendFile

  
Interest
Collada

  
Interest
Compatibility
This issue affects/is about backward or forward 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
Issues relating to Wayland windowing support.

  
Interest
Workbench

  
Interest: X11

Issues relating to Xorg/X11 support.

  
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
Issues relating to security: https://wiki.blender.org/wiki/Process/Vulnerability_Reports

  
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 Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser
Interest
Asset Browser Project Overview
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
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Grease Pencil
Assignees
Clear assignees
No Assignees
4 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#120605
No description provided.
Delete Branch "PratikPB2123/blender:gpv3-channels-in-dopesheet"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?