WIP: Geometry Nodes: make instance handling more explicit when modifying all real geometries #113933

Draft
Jacques Lucke wants to merge 3 commits from JacquesLucke/blender:modify-real-geometries into main

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

When using modify_geometry_sets one had to be a bit careful before that one does not do any operations on the geometry-set that would cause a crash or race condition. For example, one was not allowed to modify/remove the instance references of the original instances.

With this refactor, the purpose of the function (processing all real geometries) becomes a bit more explicit. Furthermore, the instance handling is changed so that one does not have to be as careful anymore. That's because the original instances are removed before the callback is called and are added back afterwards.

TODO:

  • Figure out how to reuse the join geometry code in blenkernel.
When using `modify_geometry_sets` one had to be a bit careful before that one does not do any operations on the geometry-set that would cause a crash or race condition. For example, one was not allowed to modify/remove the instance references of the original instances. With this refactor, the purpose of the function (processing all real geometries) becomes a bit more explicit. Furthermore, the instance handling is changed so that one does not have to be as careful anymore. That's because the original instances are removed before the callback is called and are added back afterwards. TODO: * Figure out how to reuse the join geometry code in blenkernel.
Jacques Lucke added 2 commits 2023-10-19 13:51:11 +02:00
Jacques Lucke added 1 commit 2023-10-19 14:03:16 +02:00
buildbot/vexp-code-patch-coordinator Build done. Details
289bee4e96
cleanup
Jacques Lucke requested review from Hans Goudey 2023-10-19 14:03:47 +02:00
Author
Member

@blender-bot build

@blender-bot build
Member

Maybe just the join_instances and join_attributes code could move to blenkernel (instances.cc)?

Maybe just the `join_instances` and `join_attributes` code could move to blenkernel (`instances.cc`)?
Author
Member

Hm, doesn't really sound like a scalable solution to me. Feels like with this strategy we'll just end up moving more and more code into blenkernel which (at least from my perspective) doesn't really help anyone.

Maybe we could move modify_geometry_sets to the geometry module instead. There is currently one use of it in blenkernel, but that could potentially be replaced with something else. Bit of a bummer in cases like this that we don't want to add the direct dependency from blenkernel to the geometry module, even though they depend on each other indirectly already probably.

Hm, doesn't really sound like a scalable solution to me. Feels like with this strategy we'll just end up moving more and more code into blenkernel which (at least from my perspective) doesn't really help anyone. Maybe we could move `modify_geometry_sets` to the geometry module instead. There is currently one use of it in blenkernel, but that could potentially be replaced with something else. Bit of a bummer in cases like this that we don't want to add the direct dependency from blenkernel to the geometry module, even though they depend on each other indirectly already probably.
Member

I don't have a strong opinion honestly, other than that I find the one way dependency between geometry and blenkernel helpful, and I wish more of our dependencies were like that :)

I don't have a strong opinion honestly, other than that I find the one way dependency between `geometry` and `blenkernel` helpful, and I wish more of our dependencies were like that :)
All checks were successful
buildbot/vexp-code-patch-coordinator Build done.
This pull request has changes conflicting with the target branch.
  • source/blender/blenkernel/BKE_geometry_set.hh
  • source/blender/blenkernel/intern/bake_items.cc
  • source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc
  • source/blender/nodes/geometry/nodes/node_geo_mean_filter_sdf_volume.cc
  • source/blender/nodes/geometry/nodes/node_geo_mesh_to_curve.cc
  • source/blender/nodes/geometry/nodes/node_geo_mesh_to_sdf_volume.cc
  • source/blender/nodes/geometry/nodes/node_geo_offset_sdf_volume.cc
  • source/blender/nodes/geometry/nodes/node_geo_points_to_sdf_volume.cc
  • source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc
  • source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u modify-real-geometries:JacquesLucke-modify-real-geometries
git checkout JacquesLucke-modify-real-geometries
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#113933
No description provided.