Anim: make auto-keying in shapekey anim editor work for layered actions #123673

Merged
Nathan Vegdahl merged 3 commits from nathanvegdahl/blender:baklava_keying_shape_key_animation_editor into main 2024-06-25 14:15:40 +02:00
Member

It previously used duplicated, bespoke code to do the keyframing, and therefore
still only worked with legacy actions.

This makes it use the same keyframing function as everything else, making it
naturally work with layered actions as well. There should be no functional
changes for legacy actions.

It previously used duplicated, bespoke code to do the keyframing, and therefore still only worked with legacy actions. This makes it use the same keyframing function as everything else, making it naturally work with layered actions as well. There should be no functional changes for legacy actions.
Nathan Vegdahl added 1 commit 2024-06-24 14:48:18 +02:00
Nathan Vegdahl added 1 commit 2024-06-24 14:56:05 +02:00
Nathan Vegdahl reviewed 2024-06-24 14:59:55 +02:00
@ -5218,4 +5201,1 @@
/* set the special 'replace' flag if on a keyframe */
if (fcurve_frame_has_keyframe(fcu, remapped_frame)) {
flag |= INSERTKEY_REPLACE;
Author
Member

Note to reviewers: I removed this bit in the new code because I'm pretty sure it's redundant now (if it ever wasn't): if a keyframe already exists, it will be replaced regardless. Testing in the shape key animation editor confirmed that behavior didn't change.

Note to reviewers: I removed this bit in the new code because I'm pretty sure it's redundant now (if it ever wasn't): if a keyframe already exists, it will be replaced regardless. Testing in the shape key animation editor confirmed that behavior didn't change.
Nathan Vegdahl requested review from Christoph Lendenfeld 2024-06-24 15:01:02 +02:00
Iliya Katushenock reviewed 2024-06-24 15:02:21 +02:00
@ -5207,3 +5190,2 @@
/* get flags for keyframing */
flag = blender::animrig::get_keyframing_flags(scene);
// Since this is only ever called from moving a slider for an existing
Comment style format / https://developer.blender.org/docs/handbook/guidelines/c_cpp/#comments
Author
Member

Ah, thanks! (Was coding on a Rust project over the weekend and got out of the habit.)

Ah, thanks! (Was coding on a Rust project over the weekend and got out of the habit.)
nathanvegdahl marked this conversation as resolved
Nathan Vegdahl added 1 commit 2024-06-24 15:12:53 +02:00
Fix comment style
All checks were successful
buildbot/vexp-code-patch-lint Build done.
buildbot/vexp-code-patch-windows-amd64 Build done.
buildbot/vexp-code-patch-linux-x86_64 Build done.
buildbot/vexp-code-patch-darwin-x86_64 Build done.
buildbot/vexp-code-patch-darwin-arm64 Build done.
buildbot/vexp-code-patch-coordinator Build done.
bf3a5b0da3
Nathan Vegdahl requested review from Sybren A. Stüvel 2024-06-25 10:23:45 +02:00
Christoph Lendenfeld approved these changes 2024-06-25 11:18:16 +02:00
Christoph Lendenfeld left a comment
Member

looks good and works as expected. Nice work removing that duplicated code

autokeying shapekey properties does not work, but that is already broken in main. I will make a bugreport for that.

looks good and works as expected. Nice work removing that duplicated code autokeying shapekey properties does not work, but that is already broken in main. I will make a bugreport for that.
Author
Member

@blender-bot build

@blender-bot build
Nathan Vegdahl merged commit 2034884a81 into main 2024-06-25 14:15:40 +02:00
Nathan Vegdahl deleted branch baklava_keying_shape_key_animation_editor 2024-06-25 14:15:44 +02:00
Sign in to join this conversation.
No Label
Interest
Alembic
Interest
Animation & Rigging
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
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
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#123673
No description provided.