Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-07-10 06:36:16 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-07-10 06:41:51 +0300
commit8b660ea0ecd2a8faa81012c7f849b86cff9bfac6 (patch)
tree93df7390c12fef68709681371eb588eb476cc57e /source/blender/editors/uvedit/uvedit_path.c
parent96068324cd570e336f79fa543ad2ed7d3889f169 (diff)
Fix UV path redo in vert/edge mode
Redo was only working in some situations, some options were also not being forwarded.
Diffstat (limited to 'source/blender/editors/uvedit/uvedit_path.c')
-rw-r--r--source/blender/editors/uvedit/uvedit_path.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/editors/uvedit/uvedit_path.c b/source/blender/editors/uvedit/uvedit_path.c
index 8476592b587..4f0c472158a 100644
--- a/source/blender/editors/uvedit/uvedit_path.c
+++ b/source/blender/editors/uvedit/uvedit_path.c
@@ -69,7 +69,8 @@
#include "bmesh_tools.h"
-#define USE_FILL
+/* TODO(campbell): region filling, matching mesh selection. */
+// #define USE_FILL
/* -------------------------------------------------------------------- */
/** \name Local Utilities
@@ -252,7 +253,8 @@ static void mouse_mesh_uv_shortest_path_vert(Scene *scene,
};
const struct BMCalcPathUVParams params = {
- .use_topology_distance = false,
+ .use_topology_distance = op_params->use_topology_distance,
+ .use_step_face = op_params->use_face_step,
.aspect_y = aspect_y,
.cd_loop_uv_offset = cd_loop_uv_offset,
};
@@ -367,7 +369,8 @@ static void mouse_mesh_uv_shortest_path_face(Scene *scene,
};
const struct BMCalcPathUVParams params = {
- .use_topology_distance = false,
+ .use_topology_distance = op_params->use_topology_distance,
+ .use_step_face = op_params->use_face_step,
.aspect_y = aspect_y,
.cd_loop_uv_offset = cd_loop_uv_offset,
};
@@ -617,7 +620,7 @@ static int uv_shortest_path_pick_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
}
}
- if (ts->uv_selectmode & UV_SELECT_EDGE) {
+ else if (ts->uv_selectmode & UV_SELECT_EDGE) {
if (index < 0 || index >= bm->totloop) {
return OPERATOR_CANCELLED;
}