[Bf-blender-cvs] [2cb7a0066db] sculpt-dev: Merge remote-tracking branch 'origin/master' into sculpt-dev
Joseph Eagar
noreply at git.blender.org
Sat Apr 30 10:10:16 CEST 2022
Commit: 2cb7a0066db03b40f53404ab7d04d38860bcc5d8
Author: Joseph Eagar
Date: Fri Apr 29 22:37:03 2022 -0700
Branches: sculpt-dev
https://developer.blender.org/rB2cb7a0066db03b40f53404ab7d04d38860bcc5d8
Merge remote-tracking branch 'origin/master' into sculpt-dev
===================================================================
===================================================================
diff --cc intern/ghost/intern/GHOST_Wintab.cpp
index b80aa931e69,974a07db9c3..918a789867d
--- a/intern/ghost/intern/GHOST_Wintab.cpp
+++ b/intern/ghost/intern/GHOST_Wintab.cpp
@@@ -17,11 -11,8 +17,10 @@@ static void wintab_load_error(const cha
GHOST_Wintab *GHOST_Wintab::loadWintab(HWND hwnd)
{
/* Load Wintab library if available. */
-
auto handle = unique_hmodule(::LoadLibrary("Wintab32.dll"), &::FreeLibrary);
if (!handle) {
+ fprintf(stderr, "Could not find wintab32.dll\n");
+
return nullptr;
}
@@@ -202,10 -188,20 +210,20 @@@ GHOST_Wintab::GHOST_Wintab(unique_hmodu
m_context{std::move(hctx)},
m_tabletCoord{tablet},
m_systemCoord{system},
- m_pkts{queueSize}
+ m_pkts{(size_t)queueSize}
{
m_fpInfo(WTI_INTERFACE, IFC_NDEVICES, &m_numDevices);
+ WINTAB_PRINTF("Wintab Devices: %d\n", m_numDevices);
+
updateCursorInfo();
+
+ /* Debug info. */
+ printContextDebugInfo();
+ }
+
+ GHOST_Wintab::~GHOST_Wintab()
+ {
+ WINTAB_PRINTF("Closing Wintab context %p\n", m_context.get());
}
void GHOST_Wintab::enable()
diff --cc release/scripts/addons
index 787ea78f7fa,599a8db33c4..a84f9f5ff43
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 787ea78f7fa6f0373d80ba1247768402df93f8ad
-Subproject commit 599a8db33c45c2ad94f8d482f01b281252799770
++Subproject commit a84f9f5ff43f9291458cff2ce8583a956d054900
diff --cc release/scripts/presets/keyconfig/keymap_data/blender_default.py
index a952c8c9b53,78620c41d1e..abfb2860bfb
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@@ -4646,12 -5034,14 +5061,21 @@@ def km_sculpt(params)
("invert", False),
("use_modify_active", False)]}),
("sculpt.expand", {"type": 'W', "value": 'PRESS', "shift": True, "alt": True},
- {"properties": [("target", "FACE_SETS"), ("falloff_type", "BOUNDARY_FACE_SET"),("invert", False), ("use_modify_active", True)]}),
+ {"properties": [
+ ("target", "FACE_SETS"),
+ ("falloff_type", "BOUNDARY_FACE_SET"),
+ ("invert", False),
+ ("use_modify_active", True),
+ ]}),
+ ("sculpt.expand", {"type": 'W', "value": 'PRESS', "shift": True, "ctrl": True},
- {"properties": [("target", "FACE_SETS"), ("falloff_type", "POLY_LOOP"), ("invert", False), ("use_modify_active", False)]}),
++ {"properties": [
++ ("target", "FACE_SETS"),
++ ("falloff_type", "POLY_LOOP"),
++ ("invert", False),
++ ("use_modify_active", False),
++ ]}),
# Partial Visibility Show/hide
- # Match keys from: `_template_items_hide_reveal_actions`, cannot use
- # because arguments aren't compatible.
+ # Match keys from: `_template_items_hide_reveal_actions`, cannot use because arguments aren't compatible.
("sculpt.face_set_change_visibility", {"type": 'H', "value": 'PRESS'},
{"properties": [("mode", 'TOGGLE')]}),
("sculpt.face_set_change_visibility", {"type": 'H', "value": 'PRESS', "shift": True},
@@@ -4689,8 -5084,7 +5118,7 @@@
{"properties": [("scalar", 0.9)]}),
("brush.scale_size", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "repeat": True},
{"properties": [("scalar", 1.0 / 0.9)]}),
- *_template_paint_radial_control("sculpt", rotation=True),
+ *_template_paint_radial_control_channels("sculpt", rotation=True),
- #*_template_paint_radial_control("sculpt", rotation=True),
# Stencil
("brush.stencil_control", {"type": 'RIGHTMOUSE', "value": 'PRESS'},
{"properties": [("mode", 'TRANSLATION')]}),
@@@ -6494,75 -7315,64 +7349,97 @@@ def km_3d_view_tool_sculpt_lasso_trim(p
def km_3d_view_tool_sculpt_line_mask(params):
- return ("3D View Tool: Sculpt, Line Mask",
+ return (
+ "3D View Tool: Sculpt, Line Mask",
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
- {"items": [("paint.mask_line_gesture", params.tool_maybe_tweak_event,
+ {"items": [
+ ("paint.mask_line_gesture", params.tool_maybe_tweak_event,
{"properties": [("value", 1.0)]}),
("paint.mask_line_gesture", {**params.tool_maybe_tweak_event, "ctrl": True},
- {"properties": [("value", 0.0)]}),]},)
+ {"properties": [("value", 0.0)]}),
+ ]},
+ )
+
+def km_3d_view_tool_sculpt_mask_select(params):
+ return ("3D View Tool: Sculpt, Mask Select",
+ {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+ {"items":
+ [("sculpt.expand",
+ {"type": 'LEFTMOUSE', "value": 'PRESS'},
+ {"properties": [("use_preserve_flip_inverse", False), ("invert", True), ("use_mask_preserve", False)]},),
+ ("sculpt.expand",
+ {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True},
+ {"properties": [("use_preserve_flip_inverse", True), ("invert", True), ("use_mask_preserve", True)]}),
+ ("sculpt.expand",
+ {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True, "ctrl": True},
+ {"properties": [("use_preserve_flip_inverse", True), ("invert", False), ("use_mask_preserve", True)]}),
+ ("sculpt.expand",
+ {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl" : True},
+ {"properties": [("use_preserve_flip_inverse", False), ("invert", False), ("use_mask_preserve", False)]},),]})
+
def km_3d_view_tool_sculpt_line_project(params):
- return ("3D View Tool: Sculpt, Line Project",
+ return (
+ "3D View Tool: Sculpt, Line Project",
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
- {"items": [("sculpt.project_line_gesture", params.tool_maybe_tweak_event, None),]},)
+ {"items": [
+ ("sculpt.project_line_gesture", params.tool_maybe_tweak_event, None),
+ ]},
+ )
+def km_3d_view_tool_sculpt_lasso_project(params):
+ return ("3D View Tool: Sculpt, Lasso Project",
+ {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+ {"items": [("sculpt.project_lasso_gesture", {"type": params.tool_mouse, "value": 'CLICK_DRAG'},
+ None),]},)
+
+def km_3d_view_tool_sculpt_box_project(params):
+ return ("3D View Tool: Sculpt, Box Project",
- {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+ {"items": [("sculpt.project_box_gesture", {"type": params.tool_mouse, "value": 'CLICK_DRAG'},
+ None),]},)
+
-
- def km_3d_view_tool_sculpt_mesh_filter(params):
- return ("3D View Tool: Sculpt, Mesh Filter",
- {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
- {"items": [("sculpt.mesh_filter", params.tool_maybe_tweak_event, None)]},)
-
+def km_3d_view_tool_sculpt_ipmask_filter(params):
+ return ("3D View Tool: Sculpt, IPMask Filter",
+ {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+ {"items": [("sculpt.ipmask_filter", {"type": params.tool_mouse, "value": 'CLICK_DRAG'},
+ None)]},)
+ def km_3d_view_tool_sculpt_mesh_filter(params):
+ return (
+ "3D View Tool: Sculpt, Mesh Filter",
+ {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+ {"items": [
+ ("sculpt.mesh_filter", params.tool_maybe_tweak_event, None)
+ ]},
+ )
+
def km_3d_view_tool_sculpt_cloth_filter(params):
- return ("3D View Tool: Sculpt, Cloth Filter",
+ return (
+ "3D View Tool: Sculpt, Cloth Filter",
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
- {"items": [("sculpt.cloth_filter", params.tool_maybe_tweak_event, None)]},)
+ {"items": [
+ ("sculpt.cloth_filter", params.tool_maybe_tweak_event, None)
+ ]},
+ )
+
def km_3d_view_tool_sculpt_color_filter(params):
- return ("3D View Tool: Sculpt, Color Filter",
+ return (
+ "3D View Tool: Sculpt, Color Filter",
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
- {"items": [("sculpt.color_filter", params.tool_maybe_tweak_event, None)]},)
+ {"items": [
+ ("sculpt.color_filter", params.tool_maybe_tweak_event, None)
+ ]},
+ )
+
def km_3d_view_tool_sculpt_mask_by_color(params):
- return ("3D View Tool: Sculpt, Mask by Color",
+ return (
+ "3D View Tool: Sculpt, Mask by Color",
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
{"items": [
- ("sculpt.mask_by_color", {"type": params.tool_mouse, "value": 'CLICK'}, None)
+ ("sculpt.mask_by_color", {"type": params.tool_mouse, "value": 'PRESS'}, None)
]},
)
diff --cc release/scripts/startup/bl_operators/wm.py
index 45542139355,0f063da40fb..ff5dc682386
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@@ -2954,12 -2938,11 +2954,12 @@@ class WM_MT_splash_quick_setup(Menu)
layout = self.layout
layout.operator_context = 'EXEC_DEFAULT'
+ show_build_notes(layout)
layout.label(text="Quick Setup")
- split = layout.split(factor=0.14) # Left margin.
+ split = layout.split(factor=0.14) # Left margin.
split.label()
- split = split.split(factor=0.73) # Content width.
+ split = split.split(factor=0.73) # Content width.
col = split.column()
diff --cc release/scripts/startup/bl_ui/properties_data_mesh.py
index 1bfd82cc790,050bf56966f..f866d60fdcd
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@@ -597,11 -600,18 +600,13 @@@ class MESH_UL_color_attributes(UIList,
split = layout.split(factor=0.50)
split.emboss = 'NONE'
- split.prop(attribute, "name", text="")
+ split.prop(attribute, "name", text="", icon='GROUP_VCOL')
- sub = split.row()
- sub.alignmen
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list