Commit: d57ce54e305adbae212a0b073cb31dc79e1228df Author: jon denning Date: Mon Jul 25 10:35:38 2022 -0400 Branches: retopo_transform https://developer.blender.org/rBd57ce54e305adbae212a0b073cb31dc79e1228df
UX-related tweaks =================================================================== M release/scripts/startup/bl_ui/space_view3d.py M source/blender/editors/transform/transform_ops.c M source/blender/editors/transform/transform_snap.c M source/blender/makesrna/intern/rna_scene.c =================================================================== diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 728ce3f377f..78f76a65950 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -6849,8 +6849,11 @@ class VIEW3D_PT_snapping(Panel): col_snapto_nonedited = col.column(align=True, heading="Snap To Non-Edited") col_snapto_nonedited.prop_enum(tool_settings, "snap_elements", 'FACE') col_snapto_nonedited.prop_enum(tool_settings, "snap_elements", 'FACE_NEAREST') + # row = col_snapto_nonedited.row(align=True) + # row.enabled = False + # row.prop_enum(tool_settings, "snap_elements", 'FACE_NEAREST') - if snap_elements - {'INCREMENT', 'FACE_NEAREST'}: + if not retopo_mode and snap_elements - {'INCREMENT', 'FACE_NEAREST'}: col_snapwith = col.column(align=True) col_snapwith.label(text='Snap With') col_snapwith.row().prop(tool_settings, "snap_target", expand=True) diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index 7c5569f1a10..3058d092abe 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -691,8 +691,7 @@ void Transform_Properties(struct wmOperatorType *ot, int flags) "use_snap_retopology_mode", true, "Target: Retopology Mode", - "Snap grabbed geometry to vertices and edges of edited objects (if " - "enabled) and to faces of non-edited objects (if enabled)"); + "Optimize snapping options for retopology work"); RNA_def_property_flag(prop, PROP_HIDDEN); /* Face Nearest options */ diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 5efad44a3ef..c9377ddfd8c 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -866,9 +866,14 @@ static void initSnappingRetopoMode(TransInfo *t) } /* Enable all possible targets. The targets will be filtered based on snap method. */ + t->tsnap.source_select = SCE_SNAP_SOURCE_ACTIVE; t->tsnap.target_select &= ~(SCE_SNAP_TARGET_NOT_ACTIVE | SCE_SNAP_TARGET_NOT_EDITED | SCE_SNAP_TARGET_NOT_NONEDITED); + t->tsnap.mode = t->tsnap.mode & + ~(SCE_SNAP_MODE_INCREMENT | SCE_SNAP_MODE_GRID | SCE_SNAP_MODE_VOLUME); t->tsnap.project = true; + + setSnappingCallback(t); } void initSnapping(TransInfo *t, wmOperator *op) diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index babbbb8b090..7ab48a648b5 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -3402,9 +3402,8 @@ static void rna_def_tool_settings(BlenderRNA *brna) prop = RNA_def_property(srna, "use_snap_retopology_mode", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "snap_flag", SCE_SNAP_RETOPOLOGY_MODE); - RNA_def_property_ui_text(prop, - "Retopology Target Mode", - "When enabled, snapping options are optimized for retopology work"); + RNA_def_property_ui_text( + prop, "Retopology Snapping Mode", "Optimize snapping options for retopology work"); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */ prop = RNA_def_property(srna, "use_snap_translate", PROP_BOOLEAN, PROP_NONE); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs