blender/blender
162
515
Fork 782
Code Issues 6.8k Pull Requests 930 Projects 19 Wiki Activity

Anim: update some uses of listbases of fcurves #127920

Merged
Nathan Vegdahl merged 3 commits from nathanvegdahl/blender:fcurve_listbase_loops into main 2024-09-24 10:00:10 +02:00
Conversation 4 Commits 3 Files Changed 8 +86 -33
Nathan Vegdahl commented 2024-09-20 16:54:17 +02:00
Member
Copy Link

Because we're moving to layered actions, which don't store their
fcurves in a list base, we need to update the places that assume the old
listbase-based structure.

This commit addresses the low-hanging fruit where code was previously
using the LISTBASE_FOREACH macro on a listbase of fcurves and it was
fairly obvious how to correctly update the code with minimal changes.
Other cases that either weren't immediately obvious or required
non-trivial code changes (or both) have been left for future PRs.
Additionally, uses of the list base that didn't use LISTBASE_FOREACH
were not investigated as part of this PR, whether trivial to update or
not.

Ref: #123424

Because we're moving to layered actions, which don't store their fcurves in a list base, we need to update the places that assume the old listbase-based structure. This commit addresses the low-hanging fruit where code was previously using the `LISTBASE_FOREACH` macro on a listbase of fcurves and it was fairly obvious how to correctly update the code with minimal changes. Other cases that either weren't immediately obvious or required non-trivial code changes (or both) have been left for future PRs. Additionally, uses of the list base that didn't use `LISTBASE_FOREACH` were not investigated as part of this PR, whether trivial to update or not. Ref: #123424
Nathan Vegdahl added the
Module
Animation & Rigging
 label 2024-09-20 16:54:17 +02:00
Nathan Vegdahl added 1 commit 2024-09-20 16:54:28 +02:00
Anim: update some uses of listbases of fcurves
All checks were successful
buildbot/vexp-code-patch-lint Build done.
Details
buildbot/vexp-code-patch-linux-x86_64 Build done.
Details
buildbot/vexp-code-patch-darwin-arm64 Build done.
Details
buildbot/vexp-code-patch-darwin-x86_64 Build done.
Details
buildbot/vexp-code-patch-windows-amd64 Build done.
Details
buildbot/vexp-code-patch-coordinator Build done.
Details
c59c585418 
Because we're moving to layered actions, which don't store their
fcurves in a list base, we need to update the places that assume the old
listbase-based structure.

This commit addressed the low-hanging fruit where it was fairly obvious
how to correctly update the code with minimal changes. Other cases that
either weren't immediately obvious or required non-trivial code changes
(or both) have been left for future PRs.
Nathan Vegdahl commented 2024-09-20 16:54:43 +02:00
Author
Member
Copy Link

@blender-bot build

@blender-bot build
Nathan Vegdahl requested review from Sybren A. Stüvel 2024-09-23 11:06:05 +02:00
Nathan Vegdahl commented 2024-09-23 11:46:26 +02:00
Author
Member
Copy Link

@blender-bot build

@blender-bot build
Nathan Vegdahl commented 2024-09-23 11:47:04 +02:00
Author
Member
Copy Link

Gah, Monday brain. Already did a build bot run...

Gah, Monday brain. Already did a build bot run...
Sybren A. Stüvel requested changes 2024-09-23 14:32:30 +02:00
Dismissed
source/blender/blenkernel/intern/anim_data.cc
@ -959,0 +963,4 @@
newName,
oldKey,
newKey,
blender::animrig::legacy::fcurves_all(strip->act),
Sybren A. Stüvel commented 2024-09-23 14:25:36 +02:00
Member
Copy Link

fcurves_all() returns a Vector, which only should be destructed after the call to fcurves_path_rename_fix() returns. Keep a reference in a local variable to do that.

Same for the other places where fcurves_all() is used directly a function parameter.

`fcurves_all()` returns a Vector, which only should be destructed after the call to `fcurves_path_rename_fix()` returns. Keep a reference in a local variable to do that. Same for the other places where `fcurves_all()` is used directly a function parameter.
Nathan Vegdahl commented 2024-09-23 15:42:08 +02:00
Author
Member
Copy Link

I could have sworn that wasn't necessary. See: https://stackoverflow.com/questions/37946437/when-exactly-does-the-destruction-of-a-temporary-object-happen-in-a-function-cal

But maybe there's something additional going on here that makes that not apply...?

I could have sworn that wasn't necessary. See: https://stackoverflow.com/questions/37946437/when-exactly-does-the-destruction-of-a-temporary-object-happen-in-a-function-cal But maybe there's something additional going on here that makes that not apply...?
Sybren A. Stüvel commented 2024-09-23 15:59:37 +02:00
Member
Copy Link

Linked from there is https://eel.is/c++draft/class.temporary#4 so yeah, my comment is moot.

Linked from there is https://eel.is/c++draft/class.temporary#4 so yeah, my comment is moot.
dr.sybren marked this conversation as resolved
source/blender/blenkernel/intern/object.cc Outdated
@ -4743,3 +4745,3 @@
AnimData *adt = ob->adt;
if (adt->action != nullptr) {
LISTBASE_FOREACH (FCurve *, fcu, &adt->action->curves) {
for (FCurve *fcu : blender::animrig::legacy::fcurves_all(adt->action)) {
Sybren A. Stüvel commented 2024-09-23 14:28:59 +02:00
Member
Copy Link

This should use legacy::fcurves_for_action_slot(adt->action, adt->slot_handle) to avoid false positives.

This should use `legacy::fcurves_for_action_slot(adt->action, adt->slot_handle)` to avoid false positives.
👍 1
nathanvegdahl marked this conversation as resolved
source/blender/editors/animation/anim_motion_paths.cc Outdated
@ -371,3 +372,3 @@
AnimKeylist *keylist = ED_keylist_create();
LISTBASE_FOREACH (FCurve *, fcu, &ob->adt->action->curves) {
for (FCurve *fcu : blender::animrig::legacy::fcurves_all(ob->adt->action)) {
Sybren A. Stüvel commented 2024-09-23 14:29:57 +02:00
Member
Copy Link

This should use legacy::fcurves_for_action_slot(adt->action, adt->slot_handle) to only consider keys of the relevant slot.

This should use `legacy::fcurves_for_action_slot(adt->action, adt->slot_handle)` to only consider keys of the relevant slot.
👍 1
nathanvegdahl marked this conversation as resolved
source/blender/editors/render/render_opengl.cc Outdated
@ -513,3 +515,3 @@
int frame_end = PEFRA;
LISTBASE_FOREACH (FCurve *, fcu, &adt->action->curves) {
for (FCurve *fcu : blender::animrig::legacy::fcurves_all(adt->action)) {
Sybren A. Stüvel commented 2024-09-23 14:31:03 +02:00
Member
Copy Link

Since this is for a specific ADT, it should use the slot for that ADT (legacy::fcurves_for_action_slot(adt->action, adt->slot_handle))

Since this is for a specific ADT, it should use the slot for that ADT (`legacy::fcurves_for_action_slot(adt->action, adt->slot_handle)`)
👍 1
nathanvegdahl marked this conversation as resolved
source/blender/io/collada/collada_utils.cpp Outdated
@ -752,3 +754,3 @@
}
void bc_enable_fcurves(bAction *act, char *bone_name)
void bc_enable_fcurves(bAction *act, blender::animrig::slot_handle_t slot_handle, char *bone_name)
Sybren A. Stüvel commented 2024-09-23 14:31:37 +02:00
Member
Copy Link

const

But also, according to #123424, this change shouldn't even be here as the Collada stuff was excluded?

`const` But also, according to #123424, this change shouldn't even be here as the Collada stuff was excluded?
👍 1
Nathan Vegdahl commented 2024-09-23 15:46:45 +02:00
Author
Member
Copy Link

The Collada todo in #123424 is for add_keyframes_from() and the things it impacts. This change is separate from that, and was a low-hanging fruit.

The Collada todo in #123424 is for `add_keyframes_from()` and the things it impacts. This change is separate from that, and was a low-hanging fruit.
👍 1
nathanvegdahl marked this conversation as resolved
Nathan Vegdahl added 1 commit 2024-09-23 15:55:51 +02:00
Nathan Vegdahl requested review from Sybren A. Stüvel 2024-09-23 15:56:10 +02:00
Nathan Vegdahl added 1 commit 2024-09-23 16:31:07 +02:00
Address additional in-person comments
All checks were successful
buildbot/vexp-code-patch-darwin-arm64 Build done.
Details
buildbot/vexp-code-patch-windows-amd64 Build done.
Details
buildbot/vexp-code-patch-darwin-x86_64 Build done.
Details
buildbot/vexp-code-patch-lint Build done.
Details
buildbot/vexp-code-patch-linux-x86_64 Build done.
Details
buildbot/vexp-code-patch-coordinator Build done.
Details
84907d7532
Nathan Vegdahl commented 2024-09-23 16:31:32 +02:00
Author
Member
Copy Link

@blender-bot build

@blender-bot build
Sybren A. Stüvel approved these changes 2024-09-23 17:33:51 +02:00
Sybren A. Stüvel left a comment
Member
Copy Link

LGTM!

LGTM!
Nathan Vegdahl merged commit 4bfa0de388 into main 2024-09-24 10:00:10 +02:00
Nathan Vegdahl deleted branch fcurve_listbase_loops 2024-09-24 10:00:14 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Sybren A. Stüvel
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
2 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#127920
No description provided.
Delete Branch "nathanvegdahl/blender:fcurve_listbase_loops"

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?