[Bf-blender-cvs] [55fac22463d] sculpt-dev: Merge branch 'master' into sculpt-dev
Joseph Eagar
noreply at git.blender.org
Fri Jan 14 11:09:45 CET 2022
Commit: 55fac22463d210b124737b7e69998f46a31954c1
Author: Joseph Eagar
Date: Fri Jan 14 02:09:31 2022 -0800
Branches: sculpt-dev
https://developer.blender.org/rB55fac22463d210b124737b7e69998f46a31954c1
Merge branch 'master' into sculpt-dev
===================================================================
===================================================================
diff --cc release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 10ab449affb,a006cd787ea..d5dc0e950a2
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@@ -5646,10 -6263,16 +5646,15 @@@ def km_image_editor_tool_uv_cursor(para
def km_image_editor_tool_uv_select(params, *, fallback):
- return (
- _fallback_id("Image Editor Tool: Uv, Tweak", fallback),
+ return (_fallback_id("Image Editor Tool: Uv, Tweak", fallback),
{"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
- {"items": [*([] if fallback else _template_items_tool_select(params, "uv.select", "uv.cursor_set", extend="extend")),
- *([] if (not params.use_fallback_tool_rmb) else _template_uv_select(type=params.select_mouse, value=params.select_mouse_value, legacy=params.legacy)),]},)
+ {"items": [
+ *([] if (fallback and (params.select_mouse == 'RIGHTMOUSE')) else _template_items_tool_select(
+ params, "uv.select", "uv.cursor_set", extend="extend")),
+ *([] if (not params.use_fallback_tool_rmb) else _template_uv_select(
+ type=params.select_mouse, value=params.select_mouse_value, legacy=params.legacy)),
+ ]},
+ )
def km_image_editor_tool_uv_select_box(params, *, fallback):
@@@ -5730,10 -6382,16 +5735,15 @@@ def km_image_editor_tool_uv_scale(param
# Tool System (Node Editor)
def km_node_editor_tool_select(params, *, fallback):
- return (
- _fallback_id("Node Tool: Tweak", fallback),
+ return (_fallback_id("Node Tool: Tweak", fallback),
{"space_type": 'NODE_EDITOR', "region_type": 'WINDOW'},
- {"items": [*([] if fallback else [("node.select", {"type": params.select_mouse, "value": 'PRESS'},
- {"properties": [("deselect_all", not params.legacy)]}),]),]},)
+ {"items": [
+ *([] if (fallback and (params.select_mouse == 'RIGHTMOUSE')) else [
+ ("node.select", {"type": params.select_mouse, "value": 'PRESS'},
+ {"properties": [("deselect_all", not params.legacy)]}),
+ ]),
+ ]},
+ )
def km_node_editor_tool_select_box(params, *, fallback):
@@@ -5796,10 -6464,16 +5806,15 @@@ def km_3d_view_tool_cursor(params)
def km_3d_view_tool_select(params, *, fallback):
- return (
- _fallback_id("3D View Tool: Tweak", fallback),
+ return (_fallback_id("3D View Tool: Tweak", fallback),
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
- {"items": [*([] if fallback else _template_items_tool_select(params, "view3d.select", "view3d.cursor3d", extend="toggle")),
- *([] if (not params.use_fallback_tool_rmb) else _template_view3d_select(type=params.select_mouse, value=params.select_mouse_value, legacy=params.legacy)),]},)
+ {"items": [
+ *([] if (fallback and (params.select_mouse == 'RIGHTMOUSE')) else _template_items_tool_select(
+ params, "view3d.select", "view3d.cursor3d", extend="toggle")),
+ *([] if (not params.use_fallback_tool_rmb) else _template_view3d_select(
+ type=params.select_mouse, value=params.select_mouse_value, legacy=params.legacy)),
+ ]},
+ )
def km_3d_view_tool_select_box(params, *, fallback):
@@@ -6442,10 -7374,16 +6457,15 @@@ def km_3d_view_tool_paint_gpencil_inter
# Tool System (3D View, Grease Pencil, Edit)
def km_3d_view_tool_edit_gpencil_select(params, *, fallback):
- return (
- _fallback_id("3D View Tool: Edit Gpencil, Tweak", fallback),
+ return (_fallback_id("3D View Tool: Edit Gpencil, Tweak", fallback),
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
- {"items": [*([] if fallback else _template_items_tool_select(params, "gpencil.select", "view3d.cursor3d", extend="toggle")),
- *([] if (not params.use_fallback_tool_rmb) else _template_view3d_gpencil_select(type=params.select_mouse, value=params.select_mouse_value, legacy=params.legacy)),]},)
+ {"items": [
+ *([] if (fallback and (params.select_mouse == 'RIGHTMOUSE')) else _template_items_tool_select(
+ params, "gpencil.select", "view3d.cursor3d", extend="toggle")),
+ *([] if (not params.use_fallback_tool_rmb) else _template_view3d_gpencil_select(
+ type=params.select_mouse, value=params.select_mouse_value, legacy=params.legacy)),
+ ]},
+ )
def km_3d_view_tool_edit_gpencil_select_box(params, *, fallback):
diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 9c9cb5b8f44,11e272fddde..1abce5fcb42
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -6530,17 -6503,8 +6530,17 @@@ class VIEW3D_PT_overlay_sculpt(Panel)
sub.active = sculpt.show_face_sets
row.prop(overlay, "sculpt_mode_face_sets_opacity", text="Face Sets")
+ row = layout.row(align=True)
+ row.prop(overlay, "sculpt_mode_use_face_set_moire")
+
+ if overlay.sculpt_mode_use_face_set_moire:
+ row = layout.row(align=True)
+ row.prop(overlay, "sculpt_mode_face_sets_moire_seed", text="Seed")
+ row.prop(overlay, "sculpt_mode_face_sets_moire_scale", text="Size")
+ row.prop(overlay, "use_sculpt_mode_face_sets_moire", text="Size")
+
- class VIEW3D_PT_overlay_pose(Panel):
+ class VIEW3D_PT_overlay_bones(Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'HEADER'
bl_parent_id = 'VIEW3D_PT_overlay'
diff --cc release/scripts/startup/bl_ui/space_view3d_toolbar.py
index c5f0c055b9a,4bd3d5cc3f2..9f5f9930c3e
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@@ -810,9 -700,9 +813,10 @@@ class VIEW3D_PT_tools_weight_gradient(P
@classmethod
def poll(cls, context):
- if context.mode != "PAINT_WEIGHT":
+ # since we dont give context above, check mode here (to not show in other modes like sculpt)
+ if context.mode != 'PAINT_WEIGHT':
return False
+
settings = context.tool_settings.weight_paint
if settings is None:
return False
diff --cc source/blender/blenkernel/BKE_data_transfer.h
index cfb567cc226,42cf2256e8c..9d06da94809
--- a/source/blender/blenkernel/BKE_data_transfer.h
+++ b/source/blender/blenkernel/BKE_data_transfer.h
@@@ -71,21 -69,16 +71,21 @@@ void BKE_object_data_transfer_dttypes_t
* Check what can do each layer type
* (if it is actually handled by transfer-data, if it supports advanced mixing.
*/
- bool BKE_object_data_transfer_get_dttypes_capacity(const int dtdata_types,
+ bool BKE_object_data_transfer_get_dttypes_capacity(int dtdata_types,
bool *r_advanced_mixing,
bool *r_threshold);
- int BKE_object_data_transfer_get_dttypes_item_types(const int dtdata_types);
+ int BKE_object_data_transfer_get_dttypes_item_types(int dtdata_types);
- int BKE_object_data_transfer_dttype_to_cdtype(const int dtdata_type);
- int BKE_object_data_transfer_dttype_to_srcdst_index(const int dtdata_type);
+ int BKE_object_data_transfer_dttype_to_cdtype(int dtdata_type);
+ int BKE_object_data_transfer_dttype_to_srcdst_index(int dtdata_type);
#define DT_DATATYPE_IS_VERT(_dt) \
- ELEM(_dt, DT_TYPE_MDEFORMVERT, DT_TYPE_SHAPEKEY, DT_TYPE_SKIN, DT_TYPE_BWEIGHT_VERT)
+ ELEM(_dt, \
+ DT_TYPE_MDEFORMVERT, \
+ DT_TYPE_SHAPEKEY, \
+ DT_TYPE_SKIN, \
+ DT_TYPE_BWEIGHT_VERT, \
+ DT_TYPE_PROPCOL)
#define DT_DATATYPE_IS_EDGE(_dt) \
ELEM(_dt, \
DT_TYPE_CREASE, \
diff --cc source/blender/blenkernel/BKE_multires.h
index 5db525e4d84,504771fa733..2288481e951
--- a/source/blender/blenkernel/BKE_multires.h
+++ b/source/blender/blenkernel/BKE_multires.h
@@@ -258,9 -257,8 +258,9 @@@ void BKE_multires_subdiv_mesh_settings_
BLI_INLINE void BKE_multires_construct_tangent_matrix(float tangent_matrix[3][3],
const float dPdu[3],
const float dPdv[3],
- const int corner);
+ int corner);
+void BKE_multires_bmesh_space_set(struct Object *ob, struct BMesh *bm, int mode);
/* Versioning. */
/**
diff --cc source/blender/blenkernel/BKE_paint.h
index 3f4845f190a,89e794cd2fc..6243f304662
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@@ -646,56 -486,6 +646,55 @@@ typedef struct SculptFakeNeighbors
/* Session data (mode-specific) */
+/* Custom Temporary Attributes */
+
+typedef struct SculptLayerParams {
+ int simple_array : 1; // cannot be combined with permanent
+ int permanent : 1; // cannot be combined with simple_array
+ int nocopy : 1;
+ int nointerp : 1;
+} SculptLayerParams;
+
+typedef struct SculptCustomLayer {
+ AttributeDomain domain;
+ int proptype;
+ SculptLayerParams params;
+
+ char name[MAX_CUSTOMDATA_LAYER_NAME];
+
+ bool is_cdlayer; // false for multires data
+ void *data; // only valid for multires and face
+ int elemsize;
+ int cd_offset; // for bmesh
+ struct CustomDataLayer *layer; // not for multires
+ bool from_bmesh; // note that layers can be fixed arrays but still from a bmesh, e.g. filter
+ // laplacian smooth
+ bool released;
+} SculptCustomLayer;
+
+/* These custom attributes have references
+ (SculptCustomLayer pointers) inside of ss->custom_layers
+ that are kept up to date with SCULPT_update_customdata_refs.
+ */
+typedef enum {
+ SCULPT_SCL_FAIRING_MASK,
+ SCULPT_SCL_FAIRING_FADE,
+ SCULPT_SCL_PREFAIRING_CO,
+ SCULPT_SCL_PERS_CO,
+ SCULPT_SCL_PERS_NO,
+ SCULPT_SCL_PERS_DISP,
+ SCULPT_SCL_LAYER_DISP,
+ SCULPT_SCL_LAYER_STROKE_ID,
+ SCULPT_SCL_ORIG_FSETS,
+ SCULPT_SCL_
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list