Cleanup: Spelling in function name
Should be no functional changes.
This commit is contained in:
parent
07ed64aae6
commit
0fe3e38b57
|
@ -305,7 +305,7 @@ void BKE_subdiv_ccg_neighbor_coords_get(const SubdivCCG *subdiv_ccg,
|
|||
const bool include_duplicates,
|
||||
SubdivCCGNeighbors *r_neighbors);
|
||||
|
||||
int BKE_subdiv_cgg_grid_to_face_index(const SubdivCCG *subdiv_ccg, const int grid_index);
|
||||
int BKE_subdiv_ccg_grid_to_face_index(const SubdivCCG *subdiv_ccg, const int grid_index);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
|
@ -388,7 +388,7 @@ void BKE_pbvh_sync_face_sets_to_grids(PBVH *bvh)
|
|||
const int gridsize = bvh->gridkey.grid_size;
|
||||
for (int i = 0; i < bvh->totgrid; i++) {
|
||||
BLI_bitmap *gh = bvh->grid_hidden[i];
|
||||
const int face_index = BKE_subdiv_cgg_grid_to_face_index(bvh->subdiv_ccg, i);
|
||||
const int face_index = BKE_subdiv_ccg_grid_to_face_index(bvh->subdiv_ccg, i);
|
||||
if (!gh && bvh->face_sets[face_index] < 0) {
|
||||
gh = bvh->grid_hidden[i] = BLI_BITMAP_NEW(bvh->gridkey.grid_area, "partialvis_update_grids");
|
||||
}
|
||||
|
|
|
@ -1781,7 +1781,7 @@ void BKE_subdiv_ccg_neighbor_coords_get(const SubdivCCG *subdiv_ccg,
|
|||
#endif
|
||||
}
|
||||
|
||||
int BKE_subdiv_cgg_grid_to_face_index(const SubdivCCG *subdiv_ccg, const int grid_index)
|
||||
int BKE_subdiv_ccg_grid_to_face_index(const SubdivCCG *subdiv_ccg, const int grid_index)
|
||||
{
|
||||
// Subdiv *subdiv = subdiv_ccg->subdiv; /* UNUSED */
|
||||
// OpenSubdiv_TopologyRefiner *topology_refiner = subdiv->topology_refiner; /* UNUSED */
|
||||
|
|
|
@ -222,7 +222,7 @@ int SCULPT_active_face_set_get(SculptSession *ss)
|
|||
case PBVH_FACES:
|
||||
return ss->face_sets[ss->active_face_index];
|
||||
case PBVH_GRIDS: {
|
||||
const int face_index = BKE_subdiv_cgg_grid_to_face_index(ss->subdiv_ccg,
|
||||
const int face_index = BKE_subdiv_ccg_grid_to_face_index(ss->subdiv_ccg,
|
||||
ss->active_grid_index);
|
||||
return ss->face_sets[face_index];
|
||||
}
|
||||
|
@ -359,7 +359,7 @@ bool SCULPT_vertex_all_face_sets_visible_get(SculptSession *ss, int index)
|
|||
case PBVH_GRIDS: {
|
||||
const CCGKey *key = BKE_pbvh_get_grid_key(ss->pbvh);
|
||||
const int grid_index = index / key->grid_area;
|
||||
const int face_index = BKE_subdiv_cgg_grid_to_face_index(ss->subdiv_ccg, grid_index);
|
||||
const int face_index = BKE_subdiv_ccg_grid_to_face_index(ss->subdiv_ccg, grid_index);
|
||||
return ss->face_sets[face_index] > 0;
|
||||
}
|
||||
}
|
||||
|
@ -382,7 +382,7 @@ void SCULPT_vertex_face_set_set(SculptSession *ss, int index, int face_set)
|
|||
case PBVH_GRIDS: {
|
||||
const CCGKey *key = BKE_pbvh_get_grid_key(ss->pbvh);
|
||||
const int grid_index = index / key->grid_area;
|
||||
const int face_index = BKE_subdiv_cgg_grid_to_face_index(ss->subdiv_ccg, grid_index);
|
||||
const int face_index = BKE_subdiv_ccg_grid_to_face_index(ss->subdiv_ccg, grid_index);
|
||||
if (ss->face_sets[face_index] > 0) {
|
||||
ss->face_sets[face_index] = abs(face_set);
|
||||
}
|
||||
|
@ -409,7 +409,7 @@ int SCULPT_vertex_face_set_get(SculptSession *ss, int index)
|
|||
case PBVH_GRIDS: {
|
||||
const CCGKey *key = BKE_pbvh_get_grid_key(ss->pbvh);
|
||||
const int grid_index = index / key->grid_area;
|
||||
const int face_index = BKE_subdiv_cgg_grid_to_face_index(ss->subdiv_ccg, grid_index);
|
||||
const int face_index = BKE_subdiv_ccg_grid_to_face_index(ss->subdiv_ccg, grid_index);
|
||||
return ss->face_sets[face_index];
|
||||
}
|
||||
}
|
||||
|
@ -433,7 +433,7 @@ bool SCULPT_vertex_has_face_set(SculptSession *ss, int index, int face_set)
|
|||
case PBVH_GRIDS: {
|
||||
const CCGKey *key = BKE_pbvh_get_grid_key(ss->pbvh);
|
||||
const int grid_index = index / key->grid_area;
|
||||
const int face_index = BKE_subdiv_cgg_grid_to_face_index(ss->subdiv_ccg, grid_index);
|
||||
const int face_index = BKE_subdiv_ccg_grid_to_face_index(ss->subdiv_ccg, grid_index);
|
||||
return ss->face_sets[face_index] == face_set;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -741,7 +741,7 @@ void GPU_pbvh_grid_buffers_update(GPU_PBVH_Buffers *buffers,
|
|||
uchar face_set_color[4] = {UCHAR_MAX, UCHAR_MAX, UCHAR_MAX, UCHAR_MAX};
|
||||
|
||||
if (show_face_sets && subdiv_ccg && sculpt_face_sets) {
|
||||
const int face_index = BKE_subdiv_cgg_grid_to_face_index(subdiv_ccg, grid_index);
|
||||
const int face_index = BKE_subdiv_ccg_grid_to_face_index(subdiv_ccg, grid_index);
|
||||
|
||||
const int fset = abs(sculpt_face_sets[face_index]);
|
||||
/* Skip for the default color Face Set to render it white. */
|
||||
|
|
Loading…
Reference in New Issue