Grease Pencil: Properly support brushes with draw mode primitive tools #127204

Julian Eisel · 2024-09-05T19:21:30+02:00

Julian Eisel commented

2024-09-05 19:21:30 +02:00

Since brush assets were merged, the brush asset selector and some other
brush UIs wouldn't show up for the primitive tools.

Turns out that these primitive tools were never tagged as using brushes
by setting the data_block member (or setting the 'USES_BRUSHES'
option since blender/blender!125911). The UI was just hardcoded to
display things like the brush selector for primitive tools. So as far as
the tool system knew, these tools did not use brushes.

Tagging the tools properly exposed some issues:

Tool settings displayed twice. Removed the redundant UI definitions.
Custom tool cursor would be overridden by brush cursor. Fixed by not
activating brush cursors if tools have their own cursor defined.
Interactions like mouse presses would not be registered by the tool,
events were blocked by the grease pencil stroke keymap. Fixed by
disabling the grease pencil stroke keymap while the primitive tools
are active.

Part of blender/blender!125449. Since brush assets were merged, the brush asset selector and some other brush UIs wouldn't show up for the primitive tools. Turns out that these primitive tools were never tagged as using brushes by setting the `data_block` member (or setting the `'USES_BRUSHES'` option since blender/blender!125911). The UI was just hardcoded to display things like the brush selector for primitive tools. So as far as the tool system knew, these tools did not use brushes. Tagging the tools properly exposed some issues: - Tool settings displayed twice. Removed the redundant UI definitions. - Custom tool cursor would be overridden by brush cursor. Fixed by not activating brush cursors if tools have their own cursor defined. - Interactions like mouse presses would not be registered by the tool, events were blocked by the grease pencil stroke keymap. Fixed by disabling the grease pencil stroke keymap while the primitive tools are active.

Julian Eisel added 1 commit 2024-09-05 19:21:40 +02:00

Grease Pencil: Properly support brushes with draw mode primitive tools dcfeb45ac9

Since brush assets were merged, the brush asset selector and some other
brush UIs wouldn't show up for the primitive tools.

Turns out that these primitive tools were never tagged as using brushes
by setting the `data_block` member (or setting the `'USES_BRUSHES'`
option since blender/blender!125911). The UI was just hardcoded to
display things like the brush selector for primitive tools. So as far as
the tool system knew, these tools did not use brushes.

Tagging the tools properly exposed some issues:
- Tool settings displayed twice. Removed the redundant UI definitions.
- Custom tool cursor would be overridden by brush cursor. Fixed by not
  activating brush cursors if tools have their own cursor defined.
- Interactions like mouse presses would not be registered by the tool,
  events were blocked by the grease pencil stroke keymap. Fixed by
  disabling the grease pencil stroke keymap while the primitive tools
  are active.

Julian Eisel referenced this pull request

2024-09-05 19:22:04 +02:00

Grease Pencil: Bring back paint mode tools using brush assets #125449

Julian Eisel added this to the Brush Assets & Asset Shelf project 2024-09-05 19:22:22 +02:00

Julian Eisel force-pushed temp-grease-pencil-draw-primitive-brush-tools from dcfeb45ac9 to 4bbbb54f90

2024-09-06 12:04:22 +02:00

Compare

Julian Eisel added 1 commit 2024-09-06 12:39:02 +02:00

Avoid depending on #125911 10caa4a56f

Julian Eisel requested review from Campbell Barton 2024-09-06 12:39:41 +02:00

Julian Eisel commented

2024-09-06 16:50:08 +02:00

The 'USE_BRUSHES' flags are commented out and there's a TODO comment. This is just so this doesn't depend on !125911 and compiles/runs without it. Pretend this wasn't the case for review :)

The `'USE_BRUSHES'` flags are commented out and there's a TODO comment. This is just so this doesn't depend on !125911 and compiles/runs without it. Pretend this wasn't the case for review :)

This pull request can be merged automatically.

This branch is out-of-date with the base branch

You are not authorized to merge this pull request.

View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u temp-grease-pencil-draw-primitive-brush-tools:JulianEisel-temp-grease-pencil-draw-primitive-brush-tools

git checkout JulianEisel-temp-grease-pencil-draw-primitive-brush-tools

Sign in to join this conversation.

No reviewers

No Label

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

Grease Pencil: Properly support brushes with draw mode primitive tools #127204

Checkout