blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

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

Draft
Tarek-Yasser wants to merge 23 commits from Tarek-Yasser/blender:102427_continued into main
pull from: Tarek-Yasser/blender:102427_continued
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 23 Files Changed 8 +2 -4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b358b2cec8 - Show all commits

4
scripts/startup/bl_ui/space_view3d.py
View File

@ -3484,8 +3484,7 @@ class VIEW3D_MT_paint(Menu):
def draw(self, _context):
layout = self.layout
layout.prop(WindowManager.operator_properties_last("sculpt.color_filter"), "fill_color")
props = layout.operator("sculpt.color_filter")
props = layout.operator("sculpt.color_filter", text="Fill Color")
props.type = "FILL"
props = layout.operator("sculpt.color_filter", text="Blur Colors")
@ -5733,7 +5732,6 @@ class VIEW3D_PT_sculpt_fill_popover(Panel):
bl_region_type = 'UI'
bl_category = "Tool"
bl_label = "Fill"
bl_context = ".sculpt_mode"
@classmethod

2
source/blender/editors/sculpt_paint/sculpt_filter_color.cc
View File

@ -460,7 +460,7 @@ void SCULPT_OT_color_filter(wmOperatorType *ot)
ot->ui = sculpt_color_filter_ui;
ot->get_name = sculpt_color_filter_get_name;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_DEPENDS_ON_CURSOR;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_DEPENDS_ON_CURSOR | OPTYPE_GRAB_CURSOR_X;
/* rna */
SCULPT_mesh_filter_properties(ot);