[Bf-blender-cvs] [2d9d08677ec] master: Cleanup: fix types from f04f9cc3d021
Chris Blackbourn
noreply at git.blender.org
Wed Nov 9 02:56:08 CET 2022
Commit: 2d9d08677ecfa2684a67c39ab1d632865716ccb4
Author: Chris Blackbourn
Date: Wed Nov 9 14:54:37 2022 +1300
Branches: master
https://developer.blender.org/rB2d9d08677ecfa2684a67c39ab1d632865716ccb4
Cleanup: fix types from f04f9cc3d021
===================================================================
M source/blender/blenkernel/BKE_mesh_mapping.h
M source/blender/editors/include/ED_mesh.h
M source/blender/editors/mesh/editmesh_utils.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_mesh_mapping.h b/source/blender/blenkernel/BKE_mesh_mapping.h
index d0813ebb168..705158bec0b 100644
--- a/source/blender/blenkernel/BKE_mesh_mapping.h
+++ b/source/blender/blenkernel/BKE_mesh_mapping.h
@@ -83,7 +83,7 @@ typedef struct UvElementMap {
struct UvElement **head_table;
/** If Non-NULL, pointer to index of each unique UV. */
- int **unique_index_table;
+ int *unique_index_table;
/** Number of islands, or zero if not calculated. */
int total_islands;
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h
index 7dfebf58bef..52527f6c1b8 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -150,7 +150,7 @@ struct UvElement *BM_uv_element_get_head(struct UvElementMap *element_map,
int BM_uv_element_get_unique_index(struct UvElementMap *element_map, struct UvElement *child);
struct UvElement **BM_uv_element_map_ensure_head_table(struct UvElementMap *element_map);
-int **BM_uv_element_map_ensure_unique_index(struct UvElementMap *element_map);
+int *BM_uv_element_map_ensure_unique_index(struct UvElementMap *element_map);
/**
* Can we edit UV's for this mesh?
diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c
index 33162cd2256..bbc092d0a99 100644
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@ -619,7 +619,7 @@ struct UvElement **BM_uv_element_map_ensure_head_table(struct UvElementMap *elem
return element_map->head_table;
}
-int **BM_uv_element_map_ensure_unique_index(struct UvElementMap *element_map)
+int *BM_uv_element_map_ensure_unique_index(struct UvElementMap *element_map)
{
if (!element_map->unique_index_table) {
element_map->unique_index_table = MEM_callocN(
@@ -650,7 +650,7 @@ int **BM_uv_element_map_ensure_unique_index(struct UvElementMap *element_map)
int BM_uv_element_get_unique_index(struct UvElementMap *element_map, struct UvElement *child)
{
- int **unique_index = BM_uv_element_map_ensure_unique_index(element_map);
+ int *unique_index = BM_uv_element_map_ensure_unique_index(element_map);
int index = child - element_map->storage;
BLI_assert(0 <= index);
BLI_assert(index < element_map->total_uvs);
More information about the Bf-blender-cvs
mailing list