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/editors | |
| parent | 912ac457a68ff9ee919a5ff67acc9a11a78b368e (diff) | |
| parent | 45f8d1783ba8b4adc32f5c39d95d1bc39c37aa5d (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 66f66bfceb8..9b00feb1cf8 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -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; } } |