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

Hans Goudey commented

2023-09-14 18:50:41 +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.

The modifier accepts non-asset groups or assets marked
as modifiers (created in the modifier context). Tool node groups
cannot be used by modifiers.
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

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

Hans Goudey requested review from Dalai Felinto 2023-09-14 19:00:00 +02:00

Hans Goudey added the

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

~~Hans Goudey referenced this pull request 2023-09-14 19:04:04 +02:00~~

Node Tools Overview #101778

Dalai Felinto commented

2023-09-15 13:00:42 +02:00

Owner

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:

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

d2146ee9f1 Merge branch 'main' into node-tool-modifier-filtering

02081ef9a4 Merge branch 'main' into node-tool-modifier-filtering

f140f99938 Store geometry nodes tool group in a separate RNA/DNA property

8ed4621268 Revert "Store geometry nodes tool group in a separate RNA/DNA property"

This reverts commit f140f99938.

c36bb1c0a6 Use poll functions instead

6fe0306698 Skip drawing pin icon for tool context

Hans Goudey merged commit 1c51f74cb4 into main

2023-09-22 17:45:08 +02:00

Hans Goudey referenced this issue from a commit

2023-09-22 17:45:09 +02:00

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

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

Animation & Rigging

Asset Browser Project Overview

Automated Testing

Blender Asset Bundle

Dependency Graph

Development Management

EEVEE & Viewport

Images & Movies

Motion Tracking

Nodes & Physics

Pipeline, Assets & IO

Platforms, Builds & Tests

Render & Cycles

Render Pipeline

Sculpt, Paint & Texture

Video Sequencer

Virtual Reality

Blender 2.8 Project

Milestone 1: Basic, Local Asset Browser

Good First Issue

Animation & Rigging

Development Management

EEVEE & Viewport

Nodes & Physics

Pipeline, Assets & IO

Platforms, Builds & Tests

Render & Cycles

Sculpt, Paint & Texture

Needs Info from Developers

Needs Information from User

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#112389

No description provided.