Geometry Nodes: Filter data-block buttons for tools and modifiers #112389

Merged
Hans Goudey merged 7 commits from HooglyBoogly/blender:node-tool-modifier-filtering into main 2023-09-22 17:45:08 +02:00
Member

In the data-block buttons in the node editor and the header,
apply a few rules to increase the separation between tool and
modifier node groups.

  1. The modifier accepts non-asset groups or assets marked
    as modifiers (created in the modifier context). Tool node groups
    cannot be used by modifiers.
  2. The tool context can only edit node group assets marked as tools
    (created in the tool context).

When switching contexts, the node group is cleared if the state would
be invalid. The tool node group is still stored in the editor's "root node
tree" property. Since it isn't retrieved from the context, the pin button
is useless, so it isn't displayed in the tool mode.

See #101778, #111526.

In the data-block buttons in the node editor and the header, apply a few rules to increase the separation between tool and modifier node groups. 1. The modifier accepts non-asset groups or assets marked as modifiers (created in the modifier context). Tool node groups cannot be used by modifiers. 2. The tool context can only edit node group assets marked as tools (created in the tool context). When switching contexts, the node group is cleared if the state would be invalid. The tool node group is still stored in the editor's "root node tree" property. Since it isn't retrieved from the context, the pin button is useless, so it isn't displayed in the tool mode. See #101778, #111526.
Hans Goudey added 1 commit 2023-09-14 18:50:50 +02:00
Hans Goudey requested review from Dalai Felinto 2023-09-14 19:00:00 +02:00
Hans Goudey added the
Interest
Geometry Nodes
label 2023-09-14 19:00:07 +02:00
Hans Goudey added this to the 4.0 milestone 2023-09-14 19:00:11 +02:00
Hans Goudey added this to the Nodes & Physics project 2023-09-14 19:00:16 +02:00

I think we should treat the "active" modifier and tool node-groups as two different pointers in the editor struct.

Meaning, when switching from Modifier to Tool context for the first time in an editor we show:

image

Later if you go back and forth we preserve the editor tool node group.

That means that when we pin a node-group we should also hide the context selector.

I think we should treat the "active" modifier and tool node-groups as two different pointers in the editor struct. Meaning, when switching from Modifier to Tool context for the first time in an editor we show: ![image](/attachments/31887bbf-baa2-4c36-b67b-8124b572859c) Later if you go back and forth we preserve the editor tool node group. That means that when we pin a node-group we should also hide the context selector.
8.8 KiB
Hans Goudey added 6 commits 2023-09-18 02:36:14 +02:00
Hans Goudey merged commit 1c51f74cb4 into main 2023-09-22 17:45:08 +02:00
Hans Goudey deleted branch node-tool-modifier-filtering 2023-09-22 17:45:10 +02:00
Sign in to join this conversation.
No reviewers
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 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#112389
No description provided.