[Bf-blender-cvs] [089870ab3a8] retopo_transform: reorg+cleaned snap menu, removed dbg prints, reorg edge snap methods
jon denning
noreply at git.blender.org
Sat Jul 16 13:00:40 CEST 2022
Commit: 089870ab3a8fdf40139a6737c25dc0662fca24f5
Author: jon denning
Date: Thu Jul 7 14:50:26 2022 -0400
Branches: retopo_transform
https://developer.blender.org/rB089870ab3a8fdf40139a6737c25dc0662fca24f5
reorg+cleaned snap menu, removed dbg prints, reorg edge snap methods
===================================================================
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform_mode_translate.c
M source/blender/editors/transform/transform_snap.c
M source/blender/editors/transform/transform_snap_object.cc
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 3201dee5b37..a71fc8d959c 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -6814,75 +6814,72 @@ class VIEW3D_PT_snapping(Panel):
snap_elements = tool_settings.snap_elements
obj = context.active_object
object_mode = obj.mode if obj else 'OBJECT'
+ show_target_options = object_mode == 'EDIT' and obj.type not in {'LATTICE', 'META', 'FONT'}
layout = self.layout
col = layout.column()
- col.active = tool_settings.use_snap
- col.label(text="Snap To")
+ if snap_elements != {'INCREMENT'} and show_target_options:
+ col.prop(
+ tool_settings,
+ "use_snap_retopology_mode",
+ text="Use Retopology Mode",
+ # icon='MOD_MESHDEFORM',
+ )
+ col.label(text="Snap To")
col.prop(tool_settings, "snap_elements", expand=True)
- col.separator()
+ # col.separator()
if 'INCREMENT' in snap_elements:
col.prop(tool_settings, "use_snap_grid_absolute")
+ if snap_elements - {'INCREMENT', 'FACE_NEAREST'}:
+ col.label(text="Snap With")
+ row = col.row(align=True)
+ row.prop(tool_settings, "snap_target", expand=True)
+
if snap_elements != {'INCREMENT'}:
- if snap_elements != {'FACE_NEAREST'}:
- col.label(text="Snap With")
- row = col.row(align=True)
- row.prop(tool_settings, "snap_target", expand=True)
-
- if obj:
- show_target_options = object_mode == 'EDIT' and obj.type not in {'LATTICE', 'META', 'FONT'}
- col.label(text="Target Selection")
- col_targetsel = col.column(align=True)
- if show_target_options:
- col_targetsel.prop(
- tool_settings,
- "use_snap_self",
- text="Include Active",
- icon='EDITMODE_HLT',
- )
- col_targetsel.prop(
- tool_settings,
- "use_snap_edit",
- text="Include Edited",
- icon='OUTLINER_DATA_MESH',
- )
- col_targetsel.prop(
- tool_settings,
- "use_snap_nonedit",
- text="Include Non-Edited",
- icon='OUTLINER_OB_MESH',
- )
+ col.label(text="Target Selection")
+ col_targetsel = col.column(align=True)
+ if show_target_options:
col_targetsel.prop(
tool_settings,
- "use_snap_selectable",
- text="Exclude Non-Selectable",
- icon='RESTRICT_SELECT_OFF',
+ "use_snap_self",
+ text="Include Active",
+ icon='EDITMODE_HLT',
)
- if show_target_options:
- col_targetsel.prop(
- tool_settings,
- "use_snap_retopology_mode",
- text="Use Retopology Mode",
- icon='MOD_MESHDEFORM',
- )
-
- if object_mode in {'OBJECT', 'POSE', 'EDIT', 'WEIGHT_PAINT'}:
- col.prop(tool_settings, "use_snap_align_rotation")
-
- col.prop(tool_settings, "use_snap_backface_culling")
+ col_targetsel.prop(
+ tool_settings,
+ "use_snap_edit",
+ text="Include Edited",
+ icon='OUTLINER_DATA_MESH',
+ )
+ col_targetsel.prop(
+ tool_settings,
+ "use_snap_nonedit",
+ text="Include Non-Edited",
+ icon='OUTLINER_OB_MESH',
+ )
+ col_targetsel.prop(
+ tool_settings,
+ "use_snap_selectable",
+ text="Exclude Non-Selectable",
+ icon='RESTRICT_SELECT_OFF',
+ )
+ col.label(text="Options")
+ # TODO(@gfxcoder): Does WEIGHT_PAINT have any snapping?
+ if object_mode in {'OBJECT', 'POSE', 'EDIT', 'WEIGHT_PAINT'}:
+ col.prop(tool_settings, "use_snap_align_rotation")
+ if snap_elements != {'FACE_NEAREST'}:
+ col.prop(tool_settings, "use_snap_backface_culling")
if 'FACE' in snap_elements:
col.prop(tool_settings, "use_snap_project")
-
if 'FACE_NEAREST' in snap_elements:
col.prop(tool_settings, 'use_snap_to_same_target')
if object_mode == 'EDIT':
col.prop(tool_settings, 'snap_face_nearest_steps')
-
if 'VOLUME' in snap_elements:
col.prop(tool_settings, "use_snap_peel_object")
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 0e0bdae792b..d9e23b98c66 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1979,9 +1979,6 @@ void transformApply(bContext *C, TransInfo *t)
{
t->context = C;
- /* TODO(gfxcoder): removed debug print */
- printf("\n\ntransformApply\n");
-
if (t->redraw == TREDRAW_HARD) {
selectConstraint(t);
if (t->transform) {
diff --git a/source/blender/editors/transform/transform_mode_translate.c b/source/blender/editors/transform/transform_mode_translate.c
index 3f3efa54b6b..65690f9069d 100644
--- a/source/blender/editors/transform/transform_mode_translate.c
+++ b/source/blender/editors/transform/transform_mode_translate.c
@@ -469,8 +469,6 @@ static void applyTranslation(TransInfo *t, const int UNUSED(mval[2]))
add_v3_v3(global_dir, values_ofs);
}
- /* TODO(gfxcoder): removed debug print */
- printf("applyTranslation -> applySnappingAsGroup()\n");
t->tsnap.snapElem = SCE_SNAP_MODE_NONE;
applySnappingAsGroup(t, global_dir);
transform_snap_grid(t, global_dir);
@@ -516,8 +514,6 @@ static void applyTranslation(TransInfo *t, const int UNUSED(mval[2]))
mul_v3_m3v3(t->values_final, t->spacemtx_inv, global_dir);
headerTranslation(t, (t->con.mode & CON_APPLY) ? t->values_final : global_dir, str);
- /* TODO(gfxcoder): removed debug print */
- printf("applyTranslation -> recalcData()\n");
recalcData(t);
ED_area_status_text(t->area, str);
}
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index e7556c23888..4a82c5a00fa 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -1474,16 +1474,6 @@ eSnapMode snapObjectsTransform(
const bool face_raycast_only = t->settings->snap_mode == SCE_SNAP_MODE_FACE_RAYCAST;
const bool use_occlusion_test = use_retopo_mode || !face_raycast_only;
- /* TODO(gfxcoder): remove debug print */
- printf(
- "snapObjectsTransform: target_select:%d snap_mode:%d use_retopo_mode:%s "
- "face_raycast_only:%s use_occlusion_test:%s\n",
- t->tsnap.target_select,
- t->settings->snap_mode,
- use_retopo_mode ? "t" : "f",
- face_raycast_only ? "t" : "f",
- use_occlusion_test ? "t" : "f");
-
return ED_transform_snap_object_project_view3d(
t->tsnap.object_context,
t->depsgraph,
diff --git a/source/blender/editors/transform/transform_snap_object.cc b/source/blender/editors/transform/transform_snap_object.cc
index 3bc08c555e4..db02031513b 100644
--- a/source/blender/editors/transform/transform_snap_object.cc
+++ b/source/blender/editors/transform/transform_snap_object.cc
@@ -556,15 +556,6 @@ static void iter_snap_objects(SnapObjectContext *sctx,
free_object_duplilist(lb);
}
- // TODO(@gfxcoder): remove these debug prints once retopology mode is getting set correctly
- const bool use_retopo_mode = (params->snap_target_select & SCE_SNAP_TARGET_RETOPOLOGY_MODE);
- const bool is_object_edited = BKE_object_is_in_editmode(obj_eval);
- printf(" snap_callback:%d obj:%s retopo:%s edit:%s\n",
- sob_callback,
- obj_eval->id.name,
- use_retopo_mode ? "t" : "f",
- is_object_edited ? "t" : "f");
-
sob_callback(sctx, params, obj_eval, obj_eval->obmat, is_object_active, data);
}
}
@@ -1036,14 +1027,7 @@ static void raycast_obj_fn(SnapObjectContext *sctx,
const bool use_retopo_mode = params->snap_target_select & SCE_SNAP_TARGET_RETOPOLOGY_MODE;
const bool is_object_edited = BKE_object_is_in_editmode(ob_eval);
- /* TODO(gfxcoder): removed debug print */
- printf("raycast_obj_fn: obj:%s retopo:%s edit:%s occlusion:%s\n",
- ob_eval->id.name,
- use_retopo_mode ? "t" : "f",
- is_object_edited ? "t" : "f",
- use_occlusion_test ? "t" : "f");
if (use_retopo_mode && is_object_edited) {
- printf(" skipped\n");
return;
}
@@ -1200,8 +1184,6 @@ static bool raycastObjects(SnapObjectContext *sctx,
data.use_occlusion_test = params->use_occlusion_test;
data.ret = false;
- /* TODO(gfxcoder): removed debug print */
- printf("raycastObjects\n");
iter_snap_objects(sctx, params, raycast_obj_fn, &data);
return data.ret;
@@ -3087,13 +3069,7 @@ static void snap_obj_fn(SnapObjectContext *sctx,
const bool use_retopo_mode = (params->snap_target_select & SCE_SNAP_TARGET_RETOPOLOGY_MODE);
const bool is_object_edited = BKE_object_is_in_editmode(ob_eval);
- /* TODO(gfxcoder): removed debug print */
- printf("snap_obj_fn: obj:%s retopo:%s edit:%s\n",
- ob_eval->id.name,
- use_retopo_mode ? "t" : "f",
- is_object_edited ? "t" : "f");
if (use_retopo_mode && !is_object_edited) {
- printf(" skipped\n");
return;
}
@@ -3234,8 +3210,6 @@ static eSnapMode snapObjectsRay(SnapObjectCon
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list