diff options
author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-04-22 18:05:04 +0300 |
---|---|---|
committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-04-22 18:05:04 +0300 |
commit | cdc399a05537506f7afe977554d774d84b140e77 (patch) | |
tree | fc44817c414599d68e143efae93f87a9448d78b2 /source/blender/blenkernel | |
parent | 912ac457a68ff9ee919a5ff67acc9a11a78b368e (diff) | |
parent | 45f8d1783ba8b4adc32f5c39d95d1bc39c37aa5d (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_subdiv_ccg.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pbvh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subdiv_ccg.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_subdiv_ccg.h b/source/blender/blenkernel/BKE_subdiv_ccg.h index 6f886a4b850..7c7638e65d2 100644 --- a/source/blender/blenkernel/BKE_subdiv_ccg.h +++ b/source/blender/blenkernel/BKE_subdiv_ccg.h @@ -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 } diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index 33aa20fa1e4..e6d672ad9d9 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -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"); } diff --git a/source/blender/blenkernel/intern/subdiv_ccg.c b/source/blender/blenkernel/intern/subdiv_ccg.c index d99c41eaa3e..6637b3e9b69 100644 --- a/source/blender/blenkernel/intern/subdiv_ccg.c +++ b/source/blender/blenkernel/intern/subdiv_ccg.c @@ -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 */ |