WIP: Sculpt: Add operators to Mask, Face Sets, and Paint menus #105410

Tarek-Yasser · 2023-03-03T17:49:39+01:00

Tarek-Yasser commented

2023-03-03 17:49:39 +01:00

The other part of #102427. This implements the rest of the operators mentioned in the issue. Mainly operators in the Mask, Face Sets, and Paint which. Details (issues, possible bugs, improvements, etc ..) Can be found in the original issue. Stuff related specifically to this PR can be found starting at this comment

The other part of #102427. This implements the rest of the operators mentioned in the issue. Mainly operators in the Mask, Face Sets, and Paint which. Details (issues, possible bugs, improvements, etc ..) Can be found in the original issue. Stuff related specifically to this PR can be found [starting at this comment](https://projects.blender.org/blender/blender/issues/102427#issuecomment-888677)

Tarek-Yasser added 17 commits 2023-03-03 17:49:49 +01:00

UI: Reorder Sculpt menu and add Move, Roatte, Scale. 11c6df7a02

UI: Add 8 more operators to the sculpt menu. 7ddb21152a

Added "Toggle Visibility", "Hide Active Face Set", "Invert Visible",
"Box Trim", "Lasso Trim", "Line Project", "Fair Positions", "Fair
Tangency".

UI: Add the 8 variants of sculpt mesh filter to the sculpt menu. 256489d011

The 8 variants are: 'SMOOTH', 'SURFACE_SMOOTH', 'INFLATE', 'RELAX',
'RELAX_FACE_SETS' 'SHARPEN', 'ENHANCE_DETAILS' 'ERASE_DISCPLACEMENT',
'RANDOM'.

UI: Remove redundant operator property/setting assignments. 8f839cd93a

Merge branch 'main' of https://projects.blender.org/blender/blender into sculpt_mode_add_menu_operators dc452e06f8

UI: Mesh filters now change the cursor and update the statusbar.

buildbot/vexp-code-patch-coordinator Build done.

Details

d6a0fccf28

Mesh filters now use the `WM_CURSOR_EW_SCROLL` and have "LMB: Confirm"
as their statusbar message.

Rebase 102427 e2a41e65a5

Pull Joseph Eagar's mesh filter improvements d43c165730

UI: Update Mask menu according to issue 102427. 4bef597a72

- Re-ordered and renamed `Mask` menu entries.
- Added `Mask by Color`
- Added `OPTYPE_DEPENDS_ON_CURSOR` to `SCULPT_OT_mask_by_color`.

Merge branch 'main' of https://projects.blender.org/blender/blender into 102427_continued 2efa17679e

UI: Add a few operators to the Face Sets menu. f916846044

Added operators:  Box/Lasso Face Set, Fair Face Set Positions/Tangency,
and Delete Face Set.
Renamed `Randomize Colors` to `Random Face Set Clors` to match the
example screenshot.

UI: Add a new menu for Paint. 75e5403398

Current exposes Color Fill, Blur Colors, Change
Hue/Saturation/Value/Brightness/Color/Red/Gree/Blue and Expand Color by
Topology.

Added a header? submenu for fill, just testing out Joseph Eagar's
suggestion.

Merge branch 'main' of https://projects.blender.org/blender/blender into 102427_continued cbd2db470b

UI: Fix misnamed "Filter Color" to "Fill Color". b358b2cec8

Also, modified the flags for `SCULPT_OT_color_filter` to grab the
cursor's X.

UI: Set cursor to WM_CURSOR_EW_SCROLL for color filter operations. 696ac86aba

Filter Color: Add modal keymap and handle cancelling. b61a74b0f6

Note that the cancelling is copied from Joseph Eagar's Filter Mesh
cancel implemenation with some tweaks to work with colors.

Filter Color: Update status bar with controls in modal mode. 86fe5f3282

Tarek-Yasser added 1 commit 2023-03-03 17:52:54 +01:00

Merge branch 'main' into 102427_continued cab6349e3d

Tarek-Yasser requested review from Julien Kaspar 2023-03-03 18:09:17 +01:00

Tarek-Yasser requested review from Joseph Eagar 2023-03-03 18:09:32 +01:00

Julien Kaspar added the

Module

Sculpt, Paint & Texture

label 2023-03-03 18:33:57 +01:00

Hans Goudey changed title from ~~Sculpt: Add operators to Mask, Face Sets, and Paint menus.~~ to Sculpt: Add operators to Mask, Face Sets, and Paint menus

2023-03-03 21:43:59 +01:00

Tarek-Yasser added 2 commits 2023-03-08 18:49:38 +01:00

Merge branch 'main' of https://projects.blender.org/blender/blender into 102427_continued d7c31e948e

Merge branch '102427_continued' of projects.blender.org:Tarek-Yasser/blender into 102427_continued 418e2e0fc6

Joseph Eagar added 1 commit 2023-04-16 23:43:20 +02:00

Merge branch 'main' into 102427_continued 6332f475c3

Joseph Eagar added 1 commit 2023-04-16 23:47:51 +02:00

fix merge error 0bca34bbde

Joseph Eagar commented

2023-04-16 23:52:18 +02:00

Ok I merged from main for you. Aside from one line of commented out code that needs to be deleted it looks good to me.

All those entries starting with "change" in the paint menu do look a bit off-putting to me. It might be a good idea to add them to a "Change" or "Filter" submenu, or perhaps just capitalize both words.

Ok I merged from main for you. Aside from one line of commented out code that needs to be deleted it looks good to me. All those entries starting with "change" in the paint menu do look a bit off-putting to me. It might be a good idea to add them to a "Change" or "Filter" submenu, or perhaps just capitalize both words.

Joseph Eagar reviewed 2023-04-16 23:52:32 +02:00

source/blender/editors/sculpt_paint/sculpt_filter_color.cc

						
				@ -224,0 +253,4 @@

				    BKE_pbvh_vertex_iter_begin (ss->pbvh, node, vd, PBVH_ITER_UNIQUE) {

				      SCULPT_orig_vert_data_update(&orig_data, &vd);

				      /* copy_v3_v3(vd.vertex, orig_data.col); */

Joseph Eagar commented

2023-04-16 23:45:09 +02:00

Remove commented out code.

Joseph Eagar added 1 commit 2023-04-16 23:54:44 +02:00

Fix another minor merge error (duplicate code) 6db4a48113

Julien Kaspar commented

2023-04-17 11:26:21 +02:00

I had another look at this patch and I think most changes look good to me.

The operators in the Paint Menu need an overhaul though. I'd recommend to cut them out of the patch for now since they'd need some more iteration. It's not as simple as the current implementation.
My thoughts on them are:

We should not add a panel for a unique "Fill Color" and a "Fill" button. Instead the Fill operator should always use the tool_settings.unified_paint_settings.color or if available the bpy.data.brushes["brush"].color (just like in vertex paint mode)
The UI needs to be revisited at some point on how we want to show the color picker, even when no painting tool is active. But that's a bigger topic that's still unclear.
The Blur operator is hard to control when dragging
Negative blurring needs to be disabled since it's not working well
The Blur adjust last operation strength doesn't go beyond 1. Probably needs a "Repeat" slider as well.
"Change" should be removed in the operator names
Eventually the operators should be rewritten to be merged similarly to the other painting modes (How I proposed in the original task description)

I had another look at this patch and I think most changes look good to me. The operators in the Paint Menu need an overhaul though. I'd recommend to cut them out of the patch for now since they'd need some more iteration. It's not as simple as the current implementation. My thoughts on them are: - We should not add a panel for a unique "Fill Color" and a "Fill" button. Instead the Fill operator should always use the `tool_settings.unified_paint_settings.color` or if available the `bpy.data.brushes["brush"].color` (just like in vertex paint mode) - The UI needs to be revisited at some point on how we want to show the color picker, even when no painting tool is active. But that's a bigger topic that's still unclear. - The Blur operator is hard to control when dragging - Negative blurring needs to be disabled since it's not working well - The Blur adjust last operation strength doesn't go beyond 1. Probably needs a "Repeat" slider as well. - "Change" should be removed in the operator names - Eventually the operators should be rewritten to be merged similarly to the other painting modes (How I proposed in the original task description)

Julien Kaspar requested changes 2023-04-17 11:28:32 +02:00

Julien Kaspar left a comment

About the rest of the changes in this patch:

The Fairing operators are now duplicated. Keep them in the "Sculpt" menu and remove them from the "Face Sets" menu
Rename "Mask Extract" to "Extract Masked" for consistency
Using "Delete Face Set" causes a crash if a Mesh Filter was used just before
"Mask by Color" needs Adjust Last Operation options
The "Sphere" Filter was removed but I don't know why?

About the rest of the changes in this patch: - The Fairing operators are now duplicated. Keep them in the "Sculpt" menu and remove them from the "Face Sets" menu - Rename "Mask Extract" to "Extract Masked" for consistency - Using "Delete Face Set" causes a crash if a Mesh Filter was used just before - "Mask by Color" needs Adjust Last Operation options - The "Sphere" Filter was removed but I don't know why?

Hans Goudey added this to the Sculpt, Paint & Texture project 2023-11-30 20:42:58 +01:00

Daniel Bystedt changed title from ~~Sculpt: Add operators to Mask, Face Sets, and Paint menus~~ to WIP: Sculpt: Add operators to Mask, Face Sets, and Paint menus

2024-04-16 16:53:23 +02:00

This pull request has changes conflicting with the target branch.

scripts/startup/bl_ui/space_view3d.py
source/blender/editors/include/ED_sculpt.h
source/blender/editors/sculpt_paint/sculpt_filter_color.cc
source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc
source/blender/editors/sculpt_paint/sculpt_intern.hh
source/blender/editors/sculpt_paint/sculpt_ops.cc

View command line instructions.

Checkout

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

git fetch -u 102427_continued:Tarek-Yasser-102427_continued

git checkout Tarek-Yasser-102427_continued

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

WIP: Sculpt: Add operators to Mask, Face Sets, and Paint menus #105410

Checkout