[Bf-blender-cvs] [88e9826529d] master: Sculpt: Fix T102889: Sculpt trim tool extrudes in perspective
Joseph Eagar
noreply at git.blender.org
Wed Jan 11 19:00:51 CET 2023
Commit: 88e9826529d1cce750181d6355a42a2bbcdb1ff3
Author: Joseph Eagar
Date: Wed Jan 11 09:57:58 2023 -0800
Branches: master
https://developer.blender.org/rB88e9826529d1cce750181d6355a42a2bbcdb1ff3
Sculpt: Fix T102889: Sculpt trim tool extrudes in perspective
Added an extrude mode enum to the trim operators to
control extrusion: "project" and "fixed." "Fixed" just
extrudes along a fixed normal and is the new default.
===================================================================
M release/datafiles/locale
M release/scripts/addons
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M source/blender/editors/sculpt_paint/paint_mask.c
M source/tools
===================================================================
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 7be7aff5a18..7084c4ecd97 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 7be7aff5a18c550465b3f7634539ed4168af7c51
+Subproject commit 7084c4ecd97d93459d9d23fd90f81589b09be5df
diff --git a/release/scripts/addons b/release/scripts/addons
index c226f867aff..a9d4443c244 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit c226f867affd12881533a54c8c90ac6eebfaca6c
+Subproject commit a9d4443c244f89399ec4bcc427e05a07950528cc
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index fb6136154c8..37cb01503d3 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1408,6 +1408,7 @@ class _defs_sculpt:
def draw_settings(_context, layout, tool):
props = tool.operator_properties("sculpt.trim_box_gesture")
layout.prop(props, "trim_mode", expand=False)
+ layout.prop(props, "trim_extrude_mode", expand=False)
layout.prop(props, "use_cursor_depth", expand=False)
return dict(
idname="builtin.box_trim",
@@ -1424,6 +1425,7 @@ class _defs_sculpt:
props = tool.operator_properties("sculpt.trim_lasso_gesture")
layout.prop(props, "trim_mode", expand=False)
layout.prop(props, "trim_orientation", expand=False)
+ layout.prop(props, "trim_extrude_mode", expand=False)
layout.prop(props, "use_cursor_depth", expand=False)
return dict(
idname="builtin.lasso_trim",
diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c
index eff24ceb0b3..3ebd5fe799d 100644
--- a/source/blender/editors/sculpt_paint/paint_mask.c
+++ b/source/blender/editors/sculpt_paint/paint_mask.c
@@ -954,6 +954,21 @@ static EnumPropertyItem prop_trim_orientation_types[] = {
{0, NULL, 0, NULL, NULL},
};
+typedef enum eSculptTrimExtrudeMode {
+ SCULPT_GESTURE_TRIM_EXTRUDE_PROJECT,
+ SCULPT_GESTURE_TRIM_EXTRUDE_FIXED
+} eSculptTrimExtrudeMode;
+
+static EnumPropertyItem prop_trim_extrude_modes[] = {
+ {SCULPT_GESTURE_TRIM_EXTRUDE_PROJECT,
+ "PROJECT",
+ 0,
+ "Project",
+ "Project back faces when extruding"},
+ {SCULPT_GESTURE_TRIM_EXTRUDE_FIXED, "FIXED", 0, "Fixed", "Extrude back faces by fixed amount"},
+ {0, NULL, 0, NULL, NULL},
+};
+
typedef struct SculptGestureTrimOperation {
SculptGestureOperation op;
@@ -967,6 +982,7 @@ typedef struct SculptGestureTrimOperation {
eSculptTrimOperationType mode;
eSculptTrimOrientationType orientation;
+ eSculptTrimExtrudeMode extrude_mode;
} SculptGestureTrimOperation;
static void sculpt_gesture_trim_normals_update(SculptGestureContext *sgcontext)
@@ -1160,23 +1176,39 @@ static void sculpt_gesture_trim_geometry_generate(SculptGestureContext *sgcontex
ED_view3d_win_to_3d_on_plane(region, shape_plane, screen_points[i], false, new_point);
madd_v3_v3fl(new_point, shape_normal, depth_front);
}
- mul_v3_m4v3(positions[i], ob_imat, new_point);
- mul_v3_m4v3(trim_operation->true_mesh_co[i], ob_imat, new_point);
+
+ copy_v3_v3(positions[i], new_point);
}
/* Write vertices coordinates for the back face. */
madd_v3_v3v3fl(depth_point, shape_origin, shape_normal, depth_back);
for (int i = 0; i < tot_screen_points; i++) {
float new_point[3];
- if (trim_operation->orientation == SCULPT_GESTURE_TRIM_ORIENTATION_VIEW) {
- ED_view3d_win_to_3d(vc->v3d, region, depth_point, screen_points[i], new_point);
+
+ if (trim_operation->extrude_mode == SCULPT_GESTURE_TRIM_EXTRUDE_PROJECT) {
+ if (trim_operation->orientation == SCULPT_GESTURE_TRIM_ORIENTATION_VIEW) {
+ ED_view3d_win_to_3d(vc->v3d, region, depth_point, screen_points[i], new_point);
+ }
+ else {
+ ED_view3d_win_to_3d_on_plane(region, shape_plane, screen_points[i], false, new_point);
+ madd_v3_v3fl(new_point, shape_normal, depth_back);
+ }
}
else {
- ED_view3d_win_to_3d_on_plane(region, shape_plane, screen_points[i], false, new_point);
+ copy_v3_v3(new_point, positions[i]);
madd_v3_v3fl(new_point, shape_normal, depth_back);
}
- mul_v3_m4v3(positions[i + tot_screen_points], ob_imat, new_point);
- mul_v3_m4v3(trim_operation->true_mesh_co[i + tot_screen_points], ob_imat, new_point);
+
+ copy_v3_v3(positions[i + tot_screen_points], new_point);
+ }
+
+ /* Project to object space. */
+ for (int i = 0; i < tot_screen_points * 2; i++) {
+ float new_point[3];
+
+ copy_v3_v3(new_point, positions[i]);
+ mul_v3_m4v3(positions[i], ob_imat, new_point);
+ mul_v3_m4v3(trim_operation->true_mesh_co[i], ob_imat, new_point);
}
/* Get the triangulation for the front/back poly. */
@@ -1404,6 +1436,7 @@ static void sculpt_gesture_init_trim_properties(SculptGestureContext *sgcontext,
trim_operation->mode = RNA_enum_get(op->ptr, "trim_mode");
trim_operation->use_cursor_depth = RNA_boolean_get(op->ptr, "use_cursor_depth");
trim_operation->orientation = RNA_enum_get(op->ptr, "trim_orientation");
+ trim_operation->extrude_mode = RNA_enum_get(op->ptr, "trim_extrude_mode");
/* If the cursor was not over the mesh, force the orientation to view. */
if (!sgcontext->ss->gesture_initial_hit) {
@@ -1431,6 +1464,12 @@ static void sculpt_trim_gesture_operator_properties(wmOperatorType *ot)
SCULPT_GESTURE_TRIM_ORIENTATION_VIEW,
"Shape Orientation",
NULL);
+ RNA_def_enum(ot->srna,
+ "trim_extrude_mode",
+ prop_trim_extrude_modes,
+ SCULPT_GESTURE_TRIM_EXTRUDE_FIXED,
+ "Extrude Mode",
+ NULL);
}
/* Project Gesture Operation. */
diff --git a/source/tools b/source/tools
index f542f4d21a0..e1744b9bd82 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit f542f4d21a077d85ffb3e43aa7f170976dee20b6
+Subproject commit e1744b9bd82527cf7e8af63362b61bd309b5711b
More information about the Bf-blender-cvs
mailing list