Fix #109021: Collection "Exclude" property lost when parent and grand-parent is disabled #109051

Closed
Dalai Felinto wants to merge 2 commits from dfelinto:fix-109021 into blender-v3.6-release

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.

This patch started on D9849 by Dirk Wallenstein. I'm moving it here for further discussions.

I added a separate commit on top of that to handle the initialization of the flags. This is required for #109021 (although not needed for #84305).

I'm not sure:

  • If the original fix is the right approach.
  • If the initialization should be done once (in doversion), or always (in readfile).
This patch started on [D9849](https://archive.blender.org/developer/D9849) by [Dirk Wallenstein](https://projects.blender.org/d-egg). I'm moving it here for further discussions. I added a separate commit on top of that to handle the initialization of the flags. This is required for #109021 (although not needed for #84305). I'm not sure: * If the original fix is the right approach. * If the initialization should be done once (in doversion), or always (in readfile).
Dalai Felinto added 1 commit 2023-06-16 12:03:31 +02:00
Dalai Felinto added this to the Core project 2023-06-16 12:04:31 +02:00
Dalai Felinto requested review from Brecht Van Lommel 2023-06-16 12:07:11 +02:00
Dalai Felinto force-pushed fix-109021 from cf2e3286d3 to f7269b9d91 2023-06-16 12:12:50 +02:00 Compare
Author
Owner

By the way, I created this patch against 3.6. Though it may make more sense to have this against main, let it see if any unforeseen bug shows up, then we backport to 3.6 LTS. It depends on the confidence of the reviewer :)

I didn't really dig into the original patch by the way, I'm mostly acting as the messenger here (and tester).

By the way, I created this patch against 3.6. Though it may make more sense to have this against main, let it see if any unforeseen bug shows up, then we backport to 3.6 LTS. It depends on the confidence of the reviewer :) I didn't really dig into the original patch by the way, I'm mostly acting as the messenger here (and tester).
Bastien Montagne requested changes 2023-07-03 12:41:24 +02:00
Bastien Montagne left a comment
Owner

The commit message of the first commit is essentially empty.

There is a critical lack of documentation (comments) about layer_collection_flag_recursive_set expected behavior, and LAYER_COLLECTION_PREVIOUSLY_EXCLUDED could also use some comments about its exact meaning, with reference to layer_collection_flag_recursive_set.

The problem of this patch is that the new behavior is just as obscure and undocumented as the original code it tries to fix. So actually understanding if it's doing what it should do is... not trivial, to say the least.


Besides that, I would rather run the do_version code systematically (or at least add a debug check that when not run, data is in expected state). Not sure where exactly, maybe as part of BKE_collections_after_lib_link, or as a new similar call next to it?

The commit message of the first commit is essentially empty. There is a critical lack of documentation (comments) about `layer_collection_flag_recursive_set` expected behavior, and `LAYER_COLLECTION_PREVIOUSLY_EXCLUDED` could also use some comments about its exact meaning, with reference to `layer_collection_flag_recursive_set`. The problem of this patch is that the new behavior is just as obscure and undocumented as the original code it tries to fix. So actually understanding if it's doing what it should do is... not trivial, to say the least. ------------------- Besides that, I would rather run the `do_version` code systematically (or at least add a debug check that when not run, data is in expected state). Not sure where exactly, maybe as part of `BKE_collections_after_lib_link`, or as a new similar call next to it?
Dalai Felinto closed this pull request 2023-10-12 16:43:59 +02:00

Pull request closed

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
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
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
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#109051
No description provided.