[Bf-blender-cvs] [0a40c671b0b] master: Cleanup: consistent ordering for scene argument to UV functions
Campbell Barton
noreply at git.blender.org
Fri Jul 17 09:41:00 CEST 2020
Commit: 0a40c671b0b5a6735bd0137ebcb3ab7568ae4481
Author: Campbell Barton
Date: Fri Jul 17 17:11:32 2020 +1000
Branches: master
https://developer.blender.org/rB0a40c671b0b5a6735bd0137ebcb3ab7568ae4481
Cleanup: consistent ordering for scene argument to UV functions
===================================================================
M source/blender/editors/include/ED_uvedit.h
M source/blender/editors/uvedit/uvedit_rip.c
M source/blender/editors/uvedit/uvedit_select.c
M source/blender/editors/uvedit/uvedit_smart_stitch.c
===================================================================
diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h
index ec41e785714..1b87fae1bb4 100644
--- a/source/blender/editors/include/ED_uvedit.h
+++ b/source/blender/editors/include/ED_uvedit.h
@@ -115,51 +115,51 @@ bool uvedit_uv_select_test(const struct Scene *scene,
struct BMLoop *l,
const int cd_loop_uv_offset);
/* uv face */
-bool uvedit_face_select_set(const struct Scene *scene,
+void uvedit_face_select_set(const struct Scene *scene,
struct BMEditMesh *em,
struct BMFace *efa,
const bool select,
const bool do_history,
const int cd_loop_uv_offset);
-bool uvedit_face_select_enable(const struct Scene *scene,
+void uvedit_face_select_enable(const struct Scene *scene,
struct BMEditMesh *em,
struct BMFace *efa,
const bool do_history,
const int cd_loop_uv_offset);
-bool uvedit_face_select_disable(const struct Scene *scene,
+void uvedit_face_select_disable(const struct Scene *scene,
struct BMEditMesh *em,
struct BMFace *efa,
const int cd_loop_uv_offset);
/* uv edge */
-void uvedit_edge_select_set(struct BMEditMesh *em,
- const struct Scene *scene,
+void uvedit_edge_select_set(const struct Scene *scene,
+ struct BMEditMesh *em,
struct BMLoop *l,
const bool select,
const bool do_history,
const int cd_loop_uv_offset);
-void uvedit_edge_select_enable(struct BMEditMesh *em,
- const struct Scene *scene,
+void uvedit_edge_select_enable(const struct Scene *scene,
+ struct BMEditMesh *em,
struct BMLoop *l,
const bool do_history,
const int cd_loop_uv_offset);
-void uvedit_edge_select_disable(struct BMEditMesh *em,
- const struct Scene *scene,
+void uvedit_edge_select_disable(const struct Scene *scene,
+ struct BMEditMesh *em,
struct BMLoop *l,
const int cd_loop_uv_offset);
/* uv vert */
-void uvedit_uv_select_set(struct BMEditMesh *em,
- const struct Scene *scene,
+void uvedit_uv_select_set(const struct Scene *scene,
+ struct BMEditMesh *em,
struct BMLoop *l,
const bool select,
const bool do_history,
const int cd_loop_uv_offset);
-void uvedit_uv_select_enable(struct BMEditMesh *em,
- const struct Scene *scene,
+void uvedit_uv_select_enable(const struct Scene *scene,
+ struct BMEditMesh *em,
struct BMLoop *l,
const bool do_history,
const int cd_loop_uv_offset);
-void uvedit_uv_select_disable(struct BMEditMesh *em,
- const struct Scene *scene,
+void uvedit_uv_select_disable(const struct Scene *scene,
+ struct BMEditMesh *em,
struct BMLoop *l,
const int cd_loop_uv_offset);
diff --git a/source/blender/editors/uvedit/uvedit_rip.c b/source/blender/editors/uvedit/uvedit_rip.c
index 562f0ce84c1..07bec2da1ae 100644
--- a/source/blender/editors/uvedit/uvedit_rip.c
+++ b/source/blender/editors/uvedit/uvedit_rip.c
@@ -857,7 +857,7 @@ static bool uv_rip_object(Scene *scene, Object *obedit, const float co[2], const
BMLoop *l_iter = BLI_gsetIterator_getKey(&gs_iter);
ULData *ul = UL(l_iter);
if (ul->side == side_from_cursor) {
- uvedit_uv_select_disable(em, scene, l_iter, cd_loop_uv_offset);
+ uvedit_uv_select_disable(scene, em, l_iter, cd_loop_uv_offset);
changed = true;
}
/* Ensure we don't operate on these again. */
@@ -875,7 +875,7 @@ static bool uv_rip_object(Scene *scene, Object *obedit, const float co[2], const
BMLoop *l_iter = BLI_gsetIterator_getKey(&gs_iter);
ULData *ul = UL(l_iter);
if (ul->side == side_from_cursor) {
- uvedit_uv_select_disable(em, scene, l_iter, cd_loop_uv_offset);
+ uvedit_uv_select_disable(scene, em, l_iter, cd_loop_uv_offset);
changed = true;
}
/* Ensure we don't operate on these again. */
diff --git a/source/blender/editors/uvedit/uvedit_select.c b/source/blender/editors/uvedit/uvedit_select.c
index ddb276a663a..12b2207b62b 100644
--- a/source/blender/editors/uvedit/uvedit_select.c
+++ b/source/blender/editors/uvedit/uvedit_select.c
@@ -161,7 +161,7 @@ static void uvedit_vertex_select_tagged(BMEditMesh *em,
BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
if (BM_elem_flag_test(l->v, BM_ELEM_TAG)) {
- uvedit_uv_select_set(em, scene, l, select, false, cd_loop_uv_offset);
+ uvedit_uv_select_set(scene, em, l, select, false, cd_loop_uv_offset);
}
}
}
@@ -202,7 +202,7 @@ bool uvedit_face_select_test(const Scene *scene, BMFace *efa, const int cd_loop_
return uvedit_face_select_test_ex(scene->toolsettings, efa, cd_loop_uv_offset);
}
-bool uvedit_face_select_set(const struct Scene *scene,
+void uvedit_face_select_set(const struct Scene *scene,
struct BMEditMesh *em,
struct BMFace *efa,
const bool select,
@@ -210,12 +210,14 @@ bool uvedit_face_select_set(const struct Scene *scene,
const int cd_loop_uv_offset)
{
if (select) {
- return uvedit_face_select_enable(scene, em, efa, do_history, cd_loop_uv_offset);
+ uvedit_face_select_enable(scene, em, efa, do_history, cd_loop_uv_offset);
+ }
+ else {
+ uvedit_face_select_disable(scene, em, efa, cd_loop_uv_offset);
}
- return uvedit_face_select_disable(scene, em, efa, cd_loop_uv_offset);
}
-bool uvedit_face_select_enable(const Scene *scene,
+void uvedit_face_select_enable(const Scene *scene,
BMEditMesh *em,
BMFace *efa,
const bool do_history,
@@ -238,14 +240,10 @@ bool uvedit_face_select_enable(const Scene *scene,
luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
luv->flag |= MLOOPUV_VERTSEL;
}
-
- return true;
}
-
- return false;
}
-bool uvedit_face_select_disable(const Scene *scene,
+void uvedit_face_select_disable(const Scene *scene,
BMEditMesh *em,
BMFace *efa,
const int cd_loop_uv_offset)
@@ -264,11 +262,7 @@ bool uvedit_face_select_disable(const Scene *scene,
luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
luv->flag &= ~MLOOPUV_VERTSEL;
}
-
- return true;
}
-
- return false;
}
bool uvedit_edge_select_test_ex(const ToolSettings *ts, BMLoop *l, const int cd_loop_uv_offset)
@@ -296,8 +290,8 @@ bool uvedit_edge_select_test(const Scene *scene, BMLoop *l, const int cd_loop_uv
return uvedit_edge_select_test_ex(scene->toolsettings, l, cd_loop_uv_offset);
}
-void uvedit_edge_select_set(BMEditMesh *em,
- const Scene *scene,
+void uvedit_edge_select_set(const Scene *scene,
+ BMEditMesh *em,
BMLoop *l,
const bool select,
const bool do_history,
@@ -305,15 +299,15 @@ void uvedit_edge_select_set(BMEditMesh *em,
{
if (select) {
- uvedit_edge_select_enable(em, scene, l, do_history, cd_loop_uv_offset);
+ uvedit_edge_select_enable(scene, em, l, do_history, cd_loop_uv_offset);
}
else {
- uvedit_edge_select_disable(em, scene, l, cd_loop_uv_offset);
+ uvedit_edge_select_disable(scene, em, l, cd_loop_uv_offset);
}
}
-void uvedit_edge_select_enable(BMEditMesh *em,
- const Scene *scene,
+void uvedit_edge_select_enable(const Scene *scene,
+ BMEditMesh *em,
BMLoop *l,
const bool do_history,
const int cd_loop_uv_offset)
@@ -348,8 +342,8 @@ void uvedit_edge_select_enable(BMEditMesh *em,
}
}
-void uvedit_edge_select_disable(BMEditMesh *em,
- const Scene *scene,
+void uvedit_edge_select_disable(const Scene *scene,
+ BMEditMesh *em,
BMLoop *l,
const int cd_loop_uv_offset)
@@ -396,23 +390,23 @@ bool uvedit_uv_select_test(const Scene *scene, BMLoop *l, const int cd_loop_uv_o
return uvedit_uv_select_test_ex(scene->toolsettings, l, cd_loop_uv_offset);
}
-void uvedit_uv_select_set(BMEditMesh *em,
- const Scene *scene,
+void uvedit_uv_select_set(const Scene *scene,
+ BMEditMesh *em,
BMLoop *l,
const bool select,
const bool do_history,
const int cd_loop_uv_offset)
{
if (select) {
- uvedit_uv_select_enable(em, scene, l, do_history, cd_loop_uv_offset);
+ uvedit_uv_select_enable(scene, em, l, do_history, cd_loop_uv_offset);
}
else {
- uvedit_uv_select_disable(em, scene, l, cd_loop_uv_offset);
+ uvedit_uv_select_disable(scene, em, l, cd_loop_uv_offset);
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list