[Bf-blender-cvs] [35af41cb496] refactor-mesh-uv-map-generic: Rename some functions to be more in line with the surrounding code
Martijn Versteegh
noreply at git.blender.org
Fri Jan 6 15:20:15 CET 2023
Commit: 35af41cb496cdcac7b15dc253f1f64476cdbd0d7
Author: Martijn Versteegh
Date: Fri Jan 6 15:12:15 2023 +0100
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rB35af41cb496cdcac7b15dc253f1f64476cdbd0d7
Rename some functions to be more in line with the surrounding code
===================================================================
M source/blender/editors/include/ED_mesh.h
M source/blender/editors/mesh/mesh_data.cc
M source/blender/makesrna/intern/rna_mesh.c
===================================================================
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h
index ff1cdad15d5..fdd0d639883 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -552,12 +552,12 @@ void ED_mesh_geometry_clear(struct Mesh *mesh);
void ED_mesh_update(struct Mesh *mesh, struct bContext *C, bool calc_edges, bool calc_edges_loose);
-bool *ED_mesh_uv_map_ensure_vert_select(struct Mesh *mesh, int uv_index);
-bool *ED_mesh_uv_map_ensure_edge_select(struct Mesh *mesh, int uv_index);
-bool *ED_mesh_uv_map_ensure_pin(struct Mesh *mesh, int uv_index);
-const bool *ED_mesh_uv_map_get_vert_select(const struct Mesh *mesh, int uv_index);
-const bool *ED_mesh_uv_map_get_edge_select(const struct Mesh *mesh, int uv_index);
-const bool *ED_mesh_uv_map_get_pin(const struct Mesh *mesh, int uv_index);
+bool *ED_mesh_uv_map_vert_select_layer_ensure(struct Mesh *mesh, int uv_map_index);
+bool *ED_mesh_uv_map_edge_select_layer_ensure(struct Mesh *mesh, int uv_map_index);
+bool *ED_mesh_uv_map_pin_layer_ensure(struct Mesh *mesh, int uv_map_index);
+const bool *ED_mesh_uv_map_vert_select_layer_get(const struct Mesh *mesh, int uv_map_index);
+const bool *ED_mesh_uv_map_edge_select_layer_get(const struct Mesh *mesh, int uv_map_index);
+const bool *ED_mesh_uv_map_pin_layer_get(const struct Mesh *mesh, int uv_map_index);
bool ED_mesh_edge_is_loose(const struct Mesh *mesh, int index);
diff --git a/source/blender/editors/mesh/mesh_data.cc b/source/blender/editors/mesh/mesh_data.cc
index 06f90dbb9be..49d452ebe3c 100644
--- a/source/blender/editors/mesh/mesh_data.cc
+++ b/source/blender/editors/mesh/mesh_data.cc
@@ -333,7 +333,7 @@ static const bool *mesh_loop_boolean_custom_data_get_by_name(const Mesh &mesh, c
return static_cast<const bool *>(CustomData_get_layer_named(&mesh.ldata, CD_PROP_BOOL, name));
}
-const bool *ED_mesh_uv_map_get_vert_select(const Mesh *mesh, const int uv_index)
+const bool *ED_mesh_uv_map_vert_select_layer_get(const Mesh *mesh, const int uv_index)
{
using namespace blender::bke;
char buffer[MAX_CUSTOMDATA_LAYER_NAME];
@@ -343,7 +343,7 @@ const bool *ED_mesh_uv_map_get_vert_select(const Mesh *mesh, const int uv_index)
}
/* UV map edge selections are stored on face corners (loops) and not on edges
* because we need selections per face edge, even when the edge is split in UV space. */
-const bool *ED_mesh_uv_map_get_edge_select(const Mesh *mesh, const int uv_index)
+const bool *ED_mesh_uv_map_edge_select_layer_get(const Mesh *mesh, const int uv_index)
{
using namespace blender::bke;
char buffer[MAX_CUSTOMDATA_LAYER_NAME];
@@ -352,7 +352,7 @@ const bool *ED_mesh_uv_map_get_edge_select(const Mesh *mesh, const int uv_index)
*mesh, BKE_uv_map_edge_selection_name_get(uv_name, buffer));
}
-const bool *ED_mesh_uv_map_get_pin(const Mesh *mesh, const int uv_index)
+const bool *ED_mesh_uv_map_pin_layer_get(const Mesh *mesh, const int uv_index)
{
using namespace blender::bke;
char buffer[MAX_CUSTOMDATA_LAYER_NAME];
@@ -372,7 +372,7 @@ static bool *ensure_corner_boolean_attribute(Mesh &mesh, const blender::StringRe
return data;
}
-bool *ED_mesh_uv_map_ensure_vert_select(Mesh *mesh, const int uv_index)
+bool *ED_mesh_uv_map_vert_select_layer_ensure(Mesh *mesh, const int uv_index)
{
using namespace blender::bke;
char buffer[MAX_CUSTOMDATA_LAYER_NAME];
@@ -380,7 +380,7 @@ bool *ED_mesh_uv_map_ensure_vert_select(Mesh *mesh, const int uv_index)
return ensure_corner_boolean_attribute(*mesh,
BKE_uv_map_vert_selection_name_get(uv_name, buffer));
}
-bool *ED_mesh_uv_map_ensure_edge_select(Mesh *mesh, const int uv_index)
+bool *ED_mesh_uv_map_edge_select_layer_ensure(Mesh *mesh, const int uv_index)
{
using namespace blender::bke;
char buffer[MAX_CUSTOMDATA_LAYER_NAME];
@@ -388,7 +388,7 @@ bool *ED_mesh_uv_map_ensure_edge_select(Mesh *mesh, const int uv_index)
return ensure_corner_boolean_attribute(*mesh,
BKE_uv_map_edge_selection_name_get(uv_name, buffer));
}
-bool *ED_mesh_uv_map_ensure_pin(Mesh *mesh, const int uv_index)
+bool *ED_mesh_uv_map_pin_layer_ensure(Mesh *mesh, const int uv_index)
{
using namespace blender::bke;
char buffer[MAX_CUSTOMDATA_LAYER_NAME];
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index 3cf59afb251..f8bb49d2b56 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -1807,7 +1807,7 @@ static char *rna_MeshUVLoop_path(const PointerRNA *ptr)
* find the associated bool layers. So we scan the available foat2 layers
* to find into which layer the pointer we got passed points. */
static bool get_uv_index_and_layer(const PointerRNA *ptr,
- int *r_uv_layer_index,
+ int *r_uv_map_index,
int *r_index_in_attribute)
{
const Mesh *mesh = rna_mesh(ptr);
@@ -1820,7 +1820,7 @@ static bool get_uv_index_and_layer(const PointerRNA *ptr,
&mesh->ldata, CD_PROP_FLOAT2, layer_i);
const ptrdiff_t index = uv_coord - layer_data;
if (index >= 0 && index < mesh->totloop) {
- *r_uv_layer_index = layer_i;
+ *r_uv_map_index = layer_i;
*r_index_in_attribute = index;
return true;
}
@@ -1833,11 +1833,11 @@ static bool get_uv_index_and_layer(const PointerRNA *ptr,
static bool rna_MeshUVLoop_select_get(PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
- int uv_index;
+ int uv_map_index;
int loop_index;
const bool *select = NULL;
- if (get_uv_index_and_layer(ptr, &uv_index, &loop_index)) {
- select = ED_mesh_uv_map_get_vert_select(mesh, uv_index);
+ if (get_uv_index_and_layer(ptr, &uv_map_index, &loop_index)) {
+ select = ED_mesh_uv_map_vert_select_layer_get(mesh, uv_map_index);
}
return select ? select[loop_index] : false;
}
@@ -1845,10 +1845,10 @@ static bool rna_MeshUVLoop_select_get(PointerRNA *ptr)
static void rna_MeshUVLoop_select_set(PointerRNA *ptr, const bool value)
{
Mesh *mesh = rna_mesh(ptr);
- int uv_index;
+ int uv_map_index;
int loop_index;
- if (get_uv_index_and_layer(ptr, &uv_index, &loop_index)) {
- bool *select = ED_mesh_uv_map_ensure_vert_select(mesh, uv_index);
+ if (get_uv_index_and_layer(ptr, &uv_map_index, &loop_index)) {
+ bool *select = ED_mesh_uv_map_vert_select_layer_ensure(mesh, uv_map_index);
select[loop_index] = value;
}
}
@@ -1856,11 +1856,11 @@ static void rna_MeshUVLoop_select_set(PointerRNA *ptr, const bool value)
static bool rna_MeshUVLoop_select_edge_get(PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
- int uv_index;
+ int uv_map_index;
int loop_index;
const bool *select_edge = NULL;
- if (get_uv_index_and_layer(ptr, &uv_index, &loop_index)) {
- select_edge = ED_mesh_uv_map_get_edge_select(mesh, uv_index);
+ if (get_uv_index_and_layer(ptr, &uv_map_index, &loop_index)) {
+ select_edge = ED_mesh_uv_map_edge_select_layer_get(mesh, uv_map_index);
}
return select_edge ? select_edge[loop_index] : false;
}
@@ -1868,10 +1868,10 @@ static bool rna_MeshUVLoop_select_edge_get(PointerRNA *ptr)
static void rna_MeshUVLoop_select_edge_set(PointerRNA *ptr, const bool value)
{
Mesh *mesh = rna_mesh(ptr);
- int uv_index;
+ int uv_map_index;
int loop_index;
- if (get_uv_index_and_layer(ptr, &uv_index, &loop_index)) {
- bool *select_edge = ED_mesh_uv_map_ensure_edge_select(mesh, uv_index);
+ if (get_uv_index_and_layer(ptr, &uv_map_index, &loop_index)) {
+ bool *select_edge = ED_mesh_uv_map_edge_select_layer_ensure(mesh, uv_map_index);
select_edge[loop_index] = value;
}
}
@@ -1879,11 +1879,11 @@ static void rna_MeshUVLoop_select_edge_set(PointerRNA *ptr, const bool value)
static bool rna_MeshUVLoop_pin_uv_get(PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
- int uv_index;
+ int uv_map_index;
int loop_index;
const bool *pin_uv = NULL;
- if (get_uv_index_and_layer(ptr, &uv_index, &loop_index)) {
- pin_uv = ED_mesh_uv_map_get_pin(mesh, uv_index);
+ if (get_uv_index_and_layer(ptr, &uv_map_index, &loop_index)) {
+ pin_uv = ED_mesh_uv_map_pin_layer_get(mesh, uv_map_index);
}
return pin_uv ? pin_uv[loop_index] : false;
}
@@ -1891,10 +1891,10 @@ static bool rna_MeshUVLoop_pin_uv_get(PointerRNA *ptr)
static void rna_MeshUVLoop_pin_uv_set(PointerRNA *ptr, const bool value)
{
Mesh *mesh = rna_mesh(ptr);
- int uv_index;
+ int uv_map_index;
int loop_index;
- if (get_uv_index_and_layer(ptr, &uv_index, &loop_index)) {
- bool *pin_uv = ED_mesh_uv_map_ensure_pin(mesh, uv_index);
+ if (get_uv_index_and_layer(ptr, &uv_map_index, &loop_index)) {
+ bool *pin_uv = ED_mesh_uv_map_pin_layer_ensure(mesh, uv_map_index);
pin_uv[loop_index] = value;
}
}
More information about the Bf-blender-cvs
mailing list