[Bf-blender-cvs] [e1cf0657d87] sculpt-dev: Merge branch 'master' into sculpt-dev
Joseph Eagar
noreply at git.blender.org
Sun Nov 14 11:35:32 CET 2021
Commit: e1cf0657d87972a9158ade853f74c08a23474f54
Author: Joseph Eagar
Date: Sun Nov 14 02:35:23 2021 -0800
Branches: sculpt-dev
https://developer.blender.org/rBe1cf0657d87972a9158ade853f74c08a23474f54
Merge branch 'master' into sculpt-dev
===================================================================
===================================================================
diff --cc release/scripts/presets/keyconfig/keymap_data/blender_default.py
index cca941ed9b6,dbc93cb6caa..baf1c2a18ea
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@@ -995,10 -1094,10 +995,11 @@@ def km_outliner(params)
{"properties": [("all", True)]}),
("outliner.item_openclose", {"type": 'EVT_TWEAK_L', "value": 'ANY'},
{"properties": [("all", False)]}),
- # Fall through to generic context menu if the item(s) selected have no type specific actions.
+ # Fall through to generic context menu if the item(s) selected have no
+ # type specific actions.
("outliner.operation", {"type": 'RIGHTMOUSE', "value": 'PRESS'}, None),
op_menu("OUTLINER_MT_context_menu", {"type": 'RIGHTMOUSE', "value": 'PRESS'}),
+ op_menu_pie("OUTLINER_MT_view_pie", {"type": 'ACCENT_GRAVE', "value": 'PRESS'}),
("outliner.item_drag_drop", {"type": 'EVT_TWEAK_L', "value": 'ANY'}, None),
("outliner.item_drag_drop", {"type": 'EVT_TWEAK_L', "value": 'ANY', "shift": True}, None),
("outliner.show_hierarchy", {"type": 'HOME', "value": 'PRESS'}, None),
@@@ -1737,12 -1816,18 +1739,14 @@@ def km_image_generic(params)
("image.save", {"type": 'S', "value": 'PRESS', "alt": True}, None),
("image.cycle_render_slot", {"type": 'J', "value": 'PRESS', "repeat": True}, None),
("image.cycle_render_slot", {"type": 'J', "value": 'PRESS', "alt": True, "repeat": True},
- {"properties": [("reverse", True)]}),])
+ {"properties": [("reverse", True)]}),
+ op_menu_pie("IMAGE_MT_view_pie", {"type": 'ACCENT_GRAVE', "value": 'PRESS'}),
+ ])
if not params.legacy:
- items.extend([
- ("image.save_as", {"type": 'S', "value": 'PRESS', "shift": True, "alt": True}, None),
- ])
+ items.extend([("image.save_as", {"type": 'S', "value": 'PRESS', "shift": True, "alt": True}, None),])
else:
- items.extend([
- ("image.save_as", {"type": 'F3', "value": 'PRESS'}, None),
- ])
+ items.extend([("image.save_as", {"type": 'F3', "value": 'PRESS'}, None),])
return keymap
diff --cc release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 1e4298505c9,2253dfa5f5d..1631bc99bf8
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@@ -2602,34 -2969,56 +2602,39 @@@ class VIEW3D_PT_tools_active(ToolSelect
_defs_transform.scale,
_defs_transform.transform,
None,
- *_tools_annotate,
- ],
- 'PAINT_TEXTURE': [
- _defs_texture_paint.generate_from_brushes,
+ *_tools_annotate,],
+ 'PAINT_TEXTURE': [_defs_texture_paint.generate_from_brushes,
None,
- lambda context: (
- VIEW3D_PT_tools_active._tools_select
+ lambda context: (VIEW3D_PT_tools_active._tools_select
if _defs_texture_paint.poll_select_mask(context)
- else ()
- ),
- *_tools_annotate,
- ],
- 'PAINT_VERTEX': [
- _defs_vertex_paint.generate_from_brushes,
+ else ()),
+ *_tools_annotate,],
+ 'PAINT_VERTEX': [_defs_vertex_paint.generate_from_brushes,
None,
- lambda context: (
- VIEW3D_PT_tools_active._tools_select
+ lambda context: (VIEW3D_PT_tools_active._tools_select
if _defs_vertex_paint.poll_select_mask(context)
- else ()
- ),
- *_tools_annotate,
- ],
- 'PAINT_WEIGHT': [
- _defs_weight_paint.generate_from_brushes,
+ else ()),
+ *_tools_annotate,],
+ 'PAINT_WEIGHT': [_defs_weight_paint.generate_from_brushes,
_defs_weight_paint.gradient,
None,
- (
- _defs_weight_paint.sample_weight,
- _defs_weight_paint.sample_weight_group,
- ),
+ (_defs_weight_paint.sample_weight,
+ _defs_weight_paint.sample_weight_group,),
None,
- lambda context: ((_defs_view3d_generic.cursor,)
+ lambda context: (
+ (
+ _defs_view3d_generic.cursor,
+ None,
+ *VIEW3D_PT_tools_active._tools_transform,
+ )
if context is None or context.pose_object
- else ()
- ),
+ else ()),
None,
- lambda context: (
- VIEW3D_PT_tools_active._tools_select
+ lambda context: (VIEW3D_PT_tools_active._tools_select
if _defs_weight_paint.poll_select_mask(context)
- else ()
- ),
- *_tools_annotate,
- ],
- 'PAINT_GPENCIL': [
- _defs_view3d_generic.cursor,
+ else ()),
+ *_tools_annotate,],
+ 'PAINT_GPENCIL': [_defs_view3d_generic.cursor,
None,
_defs_gpencil_paint.generate_from_brushes,
_defs_gpencil_paint.cutter,
diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 34a0f29f69b,3fd19dd70cf..38c54bd7719
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -161,6 -158,6 +161,7 @@@ class VIEW3D_HT_tool_header(Header)
sub.prop(context.object, "use_mesh_mirror_x", text="X", toggle=True)
sub.prop(context.object, "use_mesh_mirror_y", text="Y", toggle=True)
sub.prop(context.object, "use_mesh_mirror_z", text="Z", toggle=True)
++
if mode_string == 'EDIT_MESH':
tool_settings = context.tool_settings
layout.prop(tool_settings, "use_mesh_automerge", text="")
diff --cc release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 46a6240198f,acc3d933b85..2b42168189f
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@@ -1391,7 -987,7 +1391,6 @@@ class VIEW3D_PT_sculpt_symmetry_for_top
draw = VIEW3D_PT_sculpt_symmetry.draw
--
# ********** default tools for weight-paint ****************
diff --cc source/blender/blenloader/intern/versioning_300.c
index 709e56d5c07,5296a0b4f82..e3bd3aaec8f
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -2212,283 -2171,12 +2226,290 @@@ void blo_do_versions_300(FileData *fd,
*/
{
/* Keep this block, even when empty. */
+
+ FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
+ if (ntree->type != NTREE_CUSTOM) {
+ version_node_tree_socket_id_delim(ntree);
+ }
+ }
+ FOREACH_NODETREE_END;
}
+
+ if (!MAIN_VERSION_ATLEAST(bmain, 300, 24)) {
+ LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
+ // load old brush settings into channels
+ if (brush->channels) {
+ BKE_brush_channelset_free(brush->channels);
+ brush->channels = NULL;
+ }
+
+ BKE_brush_builtin_create(brush, brush->sculpt_tool);
+ BKE_brush_channelset_compat_load(brush->channels, brush, true);
+ }
+ }
+
+ if (!MAIN_VERSION_ATLEAST(bmain, 300, 32)) {
+ LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
+ BKE_brush_channelset_ui_init(brush, brush->sculpt_tool);
+
+ if (ELEM(brush->sculpt_tool, SCULPT_TOOL_CLAY, SCULPT_TOOL_CLAY_STRIPS) && brush->channels) {
+ BRUSHSET_SET_BOOL(brush->channels, autosmooth_use_spacing, true);
+ BRUSHSET_SET_FLOAT(brush->channels, autosmooth_spacing, 7.0f);
+
+ BRUSHSET_LOOKUP(brush->channels, radius)->mappings[BRUSH_MAPPING_PRESSURE].flag =
+ BRUSH_MAPPING_ENABLED;
+ BRUSHSET_LOOKUP(brush->channels, strength)->mappings[BRUSH_MAPPING_PRESSURE].flag =
+ BRUSH_MAPPING_ENABLED;
+
+ if (brush->sculpt_tool == SCULPT_TOOL_CLAY_STRIPS) {
+ if (BRUSHSET_GET_FLOAT(brush->channels, tip_roundness, NULL) == 0.0f) {
+ BRUSHSET_SET_FLOAT(brush->channels, tip_roundness, 0.18f);
+ }
+
+ BRUSHSET_LOOKUP(brush->channels, tip_roundness)->flag |= BRUSH_CHANNEL_SHOW_IN_WORKSPACE;
+ BRUSHSET_SET_BOOL(brush->channels, use_space_attenuation, false);
+ }
+
+ BRUSHSET_LOOKUP(brush->channels, plane_offset)->flag |= BRUSH_CHANNEL_SHOW_IN_WORKSPACE;
+
+ void reset_clay_mappings(BrushChannelSet * chset, bool strips);
+ reset_clay_mappings(brush->channels, brush->sculpt_tool == SCULPT_TOOL_CLAY_STRIPS);
+ }
+ }
+ }
+
+ if (!MAIN_VERSION_ATLEAST(bmain, 300, 33)) {
+ LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
+ if (brush->channels && brush->sculpt_tool == SCULPT_TOOL_SMOOTH) {
+ BRUSHSET_SET_BOOL(brush->channels, dyntopo_disabled, true);
+ BKE_brush_channelset_ui_init(brush, brush->sculpt_tool);
+ }
+ }
+ }
+
+ if (!MAIN_VERSION_ATLEAST(bmain, 300, 34)) {
+ LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
+ if (brush->channels && brush->sculpt_tool == SCULPT_TOOL_SMEAR) {
+ BRUSHSET_SET_BOOL(brush->channels, use_space_attenuation, false);
+ BKE_brush_channelset_ui_init(brush, brush->sculpt_tool);
+ }
+ }
+ }
+
+ if (!MAIN_VERSION_ATLEAST(bmain, 300, 35)) {
+ LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
+ BKE_brush_channelset_ui_init(brush, brush->sculpt_tool);
+ }
+ }
+
+ if (!MAIN_VERSION_ATLEAST(bmain, 300, 27)) {
+ LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
+ if (brush->channels) {
+ BKE_brush_channelset_ui_init(brush, brush->sculpt_tool);
+ }
+ }
+ }
+
+ if (!MAIN_VERSION_ATLEAST(bmain, 300, 36)) {
+ LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
+ if (brush->channels && brush->sculpt_tool == SCULPT_TOOL_CLOTH)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list