blender/blender
161
508
Fork 765
Code Issues 6.7k Pull Requests 915 Projects 18 Wiki Activity

Anim: Add Action+Slot selectors to Property editor tabs #127074

Merged
Sybren A. Stüvel merged 12 commits from dr.sybren/blender:anim/action-selectors-property-editor into main 2024-09-05 12:11:56 +02:00
Conversation 10 Commits 12 Files Changed 20 +296 -2
Sybren A. Stüvel commented 2024-09-02 14:27:29 +02:00
Member
Copy Link

Add Action + Action Slot selectors to various Property Editor tabs. This
follows the pattern established in f917b60036.

  • Armature
  • CacheFile needs discussion, currently interface is part of Modifier stack.
  • Curve
    • + Shapekey
  • Curves
  • Empty properties are on the Object.
  • Grease Pencil
  • Grease Pencil Material
  • Lattice + Shapekey
  • Light
    • + Shader Node Tree in Cycles
  • Light Probe
  • Mesh + Shapekey
  • Metaball
  • Object
  • Scene
  • Speaker
  • Text is Curves
  • Texture
    • + Shader Node Tree (potentially Cycles-only?)
  • World + NT
  • Particle Settings
  • Volume
  • Freestyle / Line Style + Shader Node Tree

Already landed in main before this PR:

  • Camera
  • Material + NT

Can be animated but not included in this PR:

  • Mask

Since this PR is about adding to the Property Editor, some data-blocks that have no representation there are thus excluded. Even when they could actually use an Action+Slot selector somewhere.

Add Action + Action Slot selectors to various Property Editor tabs. This follows the pattern established in f917b60036976a2fe2e7f990e171f20cb502a261. - [x] Armature - [ ] CacheFile needs discussion, currently interface is part of Modifier stack. - [x] Curve - [x] + Shapekey - [x] Curves - [x] ~~Empty~~ properties are on the Object. - [x] Grease Pencil - [x] Grease Pencil Material - [x] Lattice + Shapekey - [x] Light - [x] + Shader Node Tree in Cycles - [x] Light Probe - [x] Mesh + Shapekey - [x] Metaball - [x] Object - [x] Scene - [x] Speaker - [x] ~~Text~~ is Curves - [x] Texture - [x] + Shader Node Tree (potentially Cycles-only?) - [x] World + NT - [x] Particle Settings - [x] Volume - [x] Freestyle / Line Style + Shader Node Tree **Already landed in `main` before this PR:** - Camera - Material + NT **Can be animated but not included in this PR:** - Mask Since this PR is about adding to the Property Editor, some data-blocks that have no representation there are thus excluded. Even when they could actually use an Action+Slot selector somewhere.
Sybren A. Stüvel added the
Module
Animation & Rigging
 label 2024-09-02 14:27:29 +02:00
Sybren A. Stüvel added 1 commit 2024-09-02 14:27:37 +02:00 
Add Action + Action Slot selectors to various Property Editor tabs. This
follows the pattern established in f917b60036.
Nika Kutsniashvili commented 2024-09-02 16:36:57 +02:00
Contributor
Copy Link
  • Curve (not Curves) data-block also has Shape Keys of its own
  • Surface Object (and its Shape Key) and also missing from the list
  • Volume data-block is missing from the list
  • Mask data-block (which can be created in Image Editor or Movie Clip Editor) has its own weird special action and can only be seen in Mask mode of Dope Sheet. Don't know if thats important for this. (sidenote: turns out some properties of Movie Clip data-block can be animated, but no way to show them in any of animation editors)

Freestyle (which needs to be enabled from Render properties) has its own action currently, and isn't part of sceneAction, so will probably need its own picker as well

image

Update:

Freestyle (or Line Style) also has its own Shader Nodetree, but no way to expose node keyframes in dope sheet (again don't know if this important for here, just trying to find eveything that has its own action and possibly needs a slot)
image

Light objects also have their own node trees in Cycles
image

Legacy and awful Texture data-block can also be animated and has its own action. It is difficult to expose (add Displace modifier, create new texture, go to textur eproperties and animate it, make modifier active to see action).

image

To make matters worse it also has its own node-tree

image
- Curve (not Curves) data-block also has Shape Keys of its own - Surface Object (and its Shape Key) and also missing from the list - Volume data-block is missing from the list - Mask data-block (which can be created in Image Editor or Movie Clip Editor) has its own weird special action and can only be seen in Mask mode of Dope Sheet. Don't know if thats important for this. (sidenote: turns out some properties of Movie Clip data-block can be animated, but no way to show them in any of animation editors) --- Freestyle (which needs to be enabled from Render properties) has its own action currently, and isn't part of sceneAction, so will probably need its own picker as well <img width="716" alt="image" src="attachments/82a17f0a-98eb-438d-9545-c87a035cdcd4"> Update: Freestyle (or Line Style) also has its own Shader Nodetree, but no way to expose node keyframes in dope sheet (again don't know if this important for here, just trying to find eveything that has its own action and possibly needs a slot) <img width="1167" alt="image" src="attachments/91c83cca-a123-4766-b738-53e0a3c251a4"> --- Light objects also have their own node trees in Cycles <img width="1019" alt="image" src="attachments/67e3e617-d784-45dd-87e2-0c7694b28d78"> --- Legacy and awful Texture data-block can also be animated and has its own action. It is difficult to expose (add Displace modifier, create new texture, go to textur eproperties and animate it, make modifier active to see action). <img width="722" alt="image" src="attachments/38b96cd6-84d4-45e5-bf21-f23e3678c4c5"> To make matters worse it also has its own node-tree <img width="707" alt="image" src="attachments/5dbf5b02-2b75-49b7-a79f-ce4eda060747">
image.png
141 KiB
image.png
228 KiB
image.png
45 KiB
image.png
5.3 KiB
image.png
60 KiB
image.png
Sybren A. Stüvel added 4 commits 2024-09-02 17:01:46 +02:00
Sybren A. Stüvel added 1 commit 2024-09-02 17:15:42 +02:00
Sybren A. Stüvel commented 2024-09-03 10:58:14 +02:00
Author
Member
Copy Link

Thanks for the help!

  • Mask data-block (which can be created in Image Editor or Movie Clip Editor) has its own weird special action and can only be seen in Mask mode of Dope Sheet. Don't know if thats important for this. (sidenote: turns out some properties of Movie Clip data-block can be animated, but no way to show them in any of animation editors)

I'll write in the PR description that I'm intentionally skipping this one, because it's not available in the Properties Editor.

Freestyle (which needs to be enabled from Render properties) has its own action currently, and isn't part of sceneAction, so will probably need its own picker as well

👍

Freestyle (or Line Style) also has its own Shader Nodetree, but no way to expose node keyframes in dope sheet (again don't know if this important for here, just trying to find eveything that has its own action and possibly needs a slot)

The Dope sheet limitations are not important here ;-) This PR is about the Properties Editor, and if it's shown there and can have an Action, it should get a selector for it.

Light objects also have their own node trees in Cycles

👍

Legacy and awful Texture data-block can also be animated and has its own action. It is difficult to expose (add Displace modifier, create new texture, go to textur eproperties and animate it, make modifier active to see action).

Yeah, that one I've added too. I've included its "user" ID as well in there, because (at least for the particle sims) the "Texture" panel is actually showing the texture slot properties of the Particle Settings ID. And thus their animation goes into the Particle Settings Action, and not the Texture's Action. So yeah, yay for being able to put that animation into the same Action now.

To make matters worse it also has its own node-tree

Hah, nice.

Thanks again for the help!

Thanks for the help! > - Mask data-block (which can be created in Image Editor or Movie Clip Editor) has its own weird special action and can only be seen in Mask mode of Dope Sheet. Don't know if thats important for this. (sidenote: turns out some properties of Movie Clip data-block can be animated, but no way to show them in any of animation editors) I'll write in the PR description that I'm intentionally skipping this one, because it's not available in the Properties Editor. > Freestyle (which needs to be enabled from Render properties) has its own action currently, and isn't part of sceneAction, so will probably need its own picker as well :+1: > Freestyle (or Line Style) also has its own Shader Nodetree, but no way to expose node keyframes in dope sheet (again don't know if this important for here, just trying to find eveything that has its own action and possibly needs a slot) The Dope sheet limitations are not important here ;-) This PR is about the Properties Editor, and if it's shown there and can have an Action, it should get a selector for it. > Light objects also have their own node trees in Cycles :+1: > Legacy and awful Texture data-block can also be animated and has its own action. It is difficult to expose (add Displace modifier, create new texture, go to textur eproperties and animate it, make modifier active to see action). Yeah, that one I've added too. I've included its "user" ID as well in there, because (at least for the particle sims) the "Texture" panel is actually showing the texture slot properties of the Particle Settings ID. And thus their animation goes into the Particle Settings Action, and not the Texture's Action. So yeah, yay for being able to put that animation into the same Action now. > To make matters worse it also has its own node-tree Hah, nice. Thanks again for the help!
Sybren A. Stüvel added 1 commit 2024-09-03 11:04:30 +02:00
Sybren A. Stüvel added 1 commit 2024-09-03 11:13:50 +02:00
Sybren A. Stüvel added 2 commits 2024-09-03 13:18:06 +02:00
Add Freestyle line style
Some checks failed
buildbot/vexp-code-patch-lint Build done.
Details
buildbot/vexp-code-patch-linux-x86_64 Build done.
Details
buildbot/vexp-code-patch-darwin-x86_64 Build done.
Details
buildbot/vexp-code-patch-darwin-arm64 Build done.
Details
buildbot/vexp-code-patch-windows-amd64 Build done.
Details
buildbot/vexp-code-patch-coordinator Build done.
Details
888701ed50
Sybren A. Stüvel requested review from Nathan Vegdahl 2024-09-03 13:18:58 +02:00
Sybren A. Stüvel commented 2024-09-03 13:19:04 +02:00
Author
Member
Copy Link

To make matters worse it also has its own node-tree

@nickberckley how did you add that? I can see the Python property, so I can add the code, but how do I actually get to see that shader node tree in the UI?

> To make matters worse it also has its own node-tree @nickberckley how did you add that? I can see the Python property, so I can add the code, but how do I actually get to see that shader node tree in the UI?
Sybren A. Stüvel requested review from Christoph Lendenfeld 2024-09-03 13:20:38 +02:00
Nika Kutsniashvili commented 2024-09-03 13:29:26 +02:00
Contributor
Copy Link

@dr.sybren Its in separate Texture Node Editor. By default mode (next to editor button) is empty, and you have to switch to Brush. After that active texture in Textures properties category is active there as well

@dr.sybren Its in separate Texture Node Editor. By default mode (next to editor button) is empty, and you have to switch to Brush. After that active texture in Textures properties category is active there as well
Nathan Vegdahl approved these changes 2024-09-03 14:56:01 +02:00
Nathan Vegdahl left a comment
Member
Copy Link

Looks good to me, and works great in testing.

Looks good to me, and works great in testing.
❤️ 1
Christoph Lendenfeld commented 2024-09-03 16:31:35 +02:00
Member
Copy Link

why is the "New slot" button using the duplicate icon and not the "Plus"?
image

why is the "New slot" button using the duplicate icon and not the "Plus"? ![image](/attachments/156c5775-f5f6-4329-985c-031498776712)
image.png
2.1 KiB
Christoph Lendenfeld reviewed 2024-09-03 16:41:01 +02:00
Christoph Lendenfeld left a comment
Member
Copy Link

apart from the question about the "Add Slot" icon this lgtm

apart from the question about the "Add Slot" icon this lgtm
Christoph Lendenfeld approved these changes 2024-09-03 16:41:24 +02:00
Sybren A. Stüvel commented 2024-09-03 17:58:19 +02:00
Author
Member
Copy Link

@blender-bot build

@blender-bot build
Sybren A. Stüvel added 2 commits 2024-09-05 10:25:51 +02:00
Merge remote-tracking branch 'origin/main' into anim/action-selectors-property-editor
Some checks failed
buildbot/vexp-code-patch-lint Build done.
Details
buildbot/vexp-code-patch-darwin-x86_64 Build done.
Details
buildbot/vexp-code-patch-linux-x86_64 Build done.
Details
buildbot/vexp-code-patch-windows-amd64 Build done.
Details
buildbot/vexp-code-patch-coordinator Build done.
Details
buildbot/vexp-code-patch-darwin-arm64 Build done.
Details
dd94f0e603
Sybren A. Stüvel commented 2024-09-05 10:31:42 +02:00
Author
Member
Copy Link

@blender-bot build

@blender-bot build
Sybren A. Stüvel commented 2024-09-05 11:50:17 +02:00
Author
Member
Copy Link

Going to land, even though the buildbot coordinator build is still marked as failed. The failure was in the darwin/arm64 build, which seems to randomly fail on versioning test. Rebuilding gave it a green checkmark, but didn't update the coordinator status.

Going to land, even though the buildbot coordinator build is still marked as failed. The failure was in the darwin/arm64 build, which seems to randomly fail on versioning test. Rebuilding gave it a green checkmark, but didn't update the coordinator status.
Sybren A. Stüvel commented 2024-09-05 12:06:24 +02:00
Author
Member
Copy Link

@dr.sybren Its in separate Texture Node Editor. By default mode (next to editor button) is empty, and you have to switch to Brush. After that active texture in Textures properties category is active there as well

Hah, of course you have to select "Brush" to get to the Texture node for a particle system.
Fortunately my code works for this as well 😹

> @dr.sybren Its in separate Texture Node Editor. By default mode (next to editor button) is empty, and you have to switch to Brush. After that active texture in Textures properties category is active there as well Hah, of course you have to select "Brush" to get to the Texture node for a particle system. Fortunately my code works for this as well 😹
Sybren A. Stüvel commented 2024-09-05 12:07:29 +02:00
Author
Member
Copy Link

why is the "New slot" button using the duplicate icon and not the "Plus"?
image

because it's using layout.template_search(), while layout.template_action() is based on layout.template_id(). And template_search() and template_id() behave differently in this respect. We might be able to work around this, but IMO that's for a different PR.

> why is the "New slot" button using the duplicate icon and not the "Plus"? > ![image](/attachments/156c5775-f5f6-4329-985c-031498776712) because it's using `layout.template_search()`, while `layout.template_action()` is based on `layout.template_id()`. And `template_search()` and `template_id()` behave differently in this respect. We might be able to work around this, but IMO that's for a different PR.
👍 1
Sybren A. Stüvel merged commit 383c3c8253 into main 2024-09-05 12:11:56 +02:00
Sybren A. Stüvel deleted branch anim/action-selectors-property-editor 2024-09-05 12:12:00 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Nathan Vegdahl
Christoph Lendenfeld
Labels
Clear labels   
Interest
Alembic

  
Interest
Animation & Rigging

  
Interest
Asset System
Asset datablocks, libraries, browser and shelf

  
Interest
Audio

  
Interest
Automated Testing

  
Interest
Blender Asset Bundle

  
Interest
BlendFile

  
Interest
Code Documentation
Code comments, Python/RNA API descriptions

  
Interest
Collada

  
Interest
Compatibility
Backward and forward compatibility

  
Interest
Compositing

  
Interest
Core

  
Interest
Cycles

  
Interest
Dependency Graph

  
Interest
Development Management

  
Interest
EEVEE

  
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
Viewport & EEVEE

  
Interest
Virtual Reality

  
Interest
Vulkan

  
Interest
Wayland
Wayland windowing on Unix

  
Interest
Workbench

  
Interest: X11

Xorg/X11 windowing

  
Legacy
Asset Browser Project

Archived

  
Legacy
Blender 2.8 Project

Archived

  
Legacy
Milestone 1: Basic, Local Asset Browser

Archived

  
Legacy
OpenGL Error

Archived

  
Meta
Good First Issue

  
Meta
Papercut

  
Meta
Retrospective

  
Meta
Security
Related to security, see policy: https://developer.blender.org/docs/handbook/bug_reports/vulnerability_reports/

  
Module
Animation & Rigging

  
Module
Core

  
Module
Development Management

  
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

  
Module
Viewport & EEVEE

  
Platform
FreeBSD

  
Platform
Linux

  
Platform
macOS

  
Platform
Windows

  
Severity
High

  
Severity
Low

  
Severity
Normal

  
Severity
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

Archived

  
Type
Report

Archived

  
Type
To Do

No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset System
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Code Documentation
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
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
Viewport & EEVEE
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Asset Browser Project
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
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
Module
Viewport & EEVEE
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Severity
High
Severity
Low
Severity
Normal
Severity
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
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#127074
No description provided.
Delete Branch "dr.sybren/blender:anim/action-selectors-property-editor"

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?