[Bf-blender-cvs] [8b660ea0ecd] master: Fix UV path redo in vert/edge mode
Campbell Barton
noreply at git.blender.org
Fri Jul 10 05:45:51 CEST 2020
Commit: 8b660ea0ecd2a8faa81012c7f849b86cff9bfac6
Author: Campbell Barton
Date: Fri Jul 10 13:36:16 2020 +1000
Branches: master
https://developer.blender.org/rB8b660ea0ecd2a8faa81012c7f849b86cff9bfac6
Fix UV path redo in vert/edge mode
Redo was only working in some situations,
some options were also not being forwarded.
===================================================================
M source/blender/editors/uvedit/uvedit_path.c
===================================================================
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;
}
More information about the Bf-blender-cvs
mailing list