blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Cleanup: fix types from f04f9cc3d0

This commit is contained in:
Chris Blackbourn 2022-11-09 14:54:37 +13:00
parent 335082dcd3
commit 2d9d08677e
Notes: blender-bot 2023-02-14 07:31:32 +01:00 
Referenced by issue #102596, Viewport display of multiple Dupli-Collections when different draw-types are used : wireframe might disappear (only selected are garuanteed to draw)
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_mesh_mapping.h
View File

@ -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;

2
source/blender/editors/include/ED_mesh.h
View File

@ -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?

4
source/blender/editors/mesh/editmesh_utils.c
View File

@ -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);