Fix #106943: driver on inactive view layer doesn't work #107031

Manually merged
Sybren A. Stüvel merged 3 commits from dr.sybren/blender:anim/106943-bg-view-layer-driver into main 2023-04-17 13:02:55 +02:00

Animation data (including drivers) on inactive view layers now work.
The removal of such view layers was too optimistic; they are now kept
around. The bases are still removed, mostly for safety sake and to keep
the changes to a minimum.

scene_remove_unused_view_layers() has been renamed to
scene_minimize_unused_view_layers() to reflect its new functionality.

For compatibility with assumptions in other areas of the code, the function
still ensures the input view layer is at index 0.

Animation data (including drivers) on inactive view layers now work. The removal of such view layers was too optimistic; they are now kept around. The bases are still removed, mostly for safety sake and to keep the changes to a minimum. `scene_remove_unused_view_layers()` has been renamed to `scene_minimize_unused_view_layers()` to reflect its new functionality. For compatibility with assumptions in other areas of the code, the function still ensures the input view layer is at index 0.
Sybren A. Stüvel added the
Module
Animation & Rigging
label 2023-04-17 11:36:26 +02:00
Sybren A. Stüvel added 1 commit 2023-04-17 11:36:45 +02:00
94dde6866c Fix #106943: driver on inactive view layer doesn't work
Animation data (including drivers) on inactive view layers now work.
The removal of such view layers was too optimistic; they are now kept
around. The bases are still removed, mostly for safety sake and to keep
the changes to a minimum.

`scene_remove_unused_view_layers()` has been renamed to
`scene_minimize_unused_view_layers()` to reflect its new functionality.

For compatibility with assumptions in other areas of the code, the function
still ensures the input view layer is at index 0.
Sybren A. Stüvel requested review from Sergey Sharybin 2023-04-17 11:37:16 +02:00
Sybren A. Stüvel added this to the Animation & Rigging project 2023-04-17 11:37:20 +02:00

I am confused by the implementation of the view_layer_unassign_bases. It seems it is only taking care of un-assigning the active base, but it leaves the actual base list intact.

I'd imagine for the proper removal of data which might point to the original data we need to run the first block of the BKE_view_layer_free_ex which includes baseact, object_bases, object_bases_hash, layer_collections.

I am confused by the implementation of the `view_layer_unassign_bases`. It seems it is only taking care of un-assigning the active base, but it leaves the actual base list intact. I'd imagine for the proper removal of data which might point to the original data we need to run the first block of the `BKE_view_layer_free_ex` which includes `baseact`, `object_bases`, `object_bases_hash`, `layer_collections`.
Author
Member

I am confused by the implementation of the view_layer_unassign_bases. It seems it is only taking care of un-assigning the active base, but it leaves the actual base list intact.

I'm also not too sure about that; I just moved the existing code that did that when rendering to a function of its own. Figured that if that were doing the right thing, I'd better do the same thing.

I'd imagine for the proper removal of data which might point to the original data we need to run the first block of the BKE_view_layer_free_ex which includes baseact, object_bases, object_bases_hash, layer_collections.

👍

> I am confused by the implementation of the `view_layer_unassign_bases`. It seems it is only taking care of un-assigning the active base, but it leaves the actual base list intact. I'm also not too sure about that; I just moved the existing code that did that when rendering to a function of its own. Figured that if that were doing the right thing, I'd better do the same thing. > I'd imagine for the proper removal of data which might point to the original data we need to run the first block of the `BKE_view_layer_free_ex` which includes `baseact`, `object_bases`, `object_bases_hash`, `layer_collections`. :+1:

I'm also not too sure about that; I just moved the existing code that did that when rendering to a function of its own. Figured that if that were doing the right thing, I'd better do the same thing.

That code was only done for the is_render_pipeline_depsgraph. It is kind of controlled environment, so just a pare minumum was done.

For the actual evaluated depsgraph the entire view unused layers were removed, to avoid code like external render engine accessing data which is not part of the dependency graph (via scene.view_layers['random_unused_layer'].objects ...).

I don't feel like using the short-cut of basact-only for the non-pipeline depsgraph is safe. And safe code hopefully is as easy as just splitting BKE_view_layer_free_object_content from the BKE_view_layer_free_ex and call it from the view_layer_unassign_bases().

> I'm also not too sure about that; I just moved the existing code that did that when rendering to a function of its own. Figured that if that were doing the right thing, I'd better do the same thing. That code was only done for the `is_render_pipeline_depsgraph`. It is kind of controlled environment, so just a pare minumum was done. For the actual evaluated depsgraph the entire view unused layers were removed, to avoid code like external render engine accessing data which is not part of the dependency graph (via `scene.view_layers['random_unused_layer'].objects ...`). I don't feel like using the short-cut of `basact`-only for the non-pipeline depsgraph is safe. And safe code hopefully is as easy as just splitting `BKE_view_layer_free_object_content` from the `BKE_view_layer_free_ex` and call it from the `view_layer_unassign_bases()`.
Sybren A. Stüvel added 2 commits 2023-04-17 12:51:21 +02:00
Author
Member

Landing (f588a0596b) after an over-the-shoulder review + approval done by Sergey :)

Landing (f588a0596bd317972d5b15a0750d8e0dbf63bb06) after an over-the-shoulder review + approval done by Sergey :)
Sybren A. Stüvel manually merged commit f588a0596b into main 2023-04-17 13:02:55 +02:00
Sybren A. Stüvel deleted branch anim/106943-bg-view-layer-driver 2023-04-17 13:03:03 +02:00
Sybren A. Stüvel removed this from the Animation & Rigging project 2023-05-15 11:35:03 +02:00
Sign in to join this conversation.
No reviewers
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
No Milestone
No project
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#107031
No description provided.