diff options
| author | Campbell Barton <campbell@blender.org> | 2022-08-12 01:57:38 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-08-12 01:57:38 +0300 |
| commit | 62d1ed0120b26cd0860aa430ba2a03da74968556 (patch) | |
| tree | 9b7c75f71f5e7d31b1f26cadd96da900c8aeedb3 /source/blender/draw | |
| parent | 344919240c8bd9ad2457f1775596bf0a1bd7560f (diff) | |
Cleanup: replace term face with poly
Be consistent with naming to avoid mixing MPoly/MFace.
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc index 4d2a10e83ce..313838be9e8 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc @@ -87,7 +87,7 @@ static void extract_pos_nor_iter_poly_mesh(const MeshRenderData *mr, void *_data) { MeshExtract_PosNor_Data *data = static_cast<MeshExtract_PosNor_Data *>(_data); - const bool face_hidden = mr->hide_poly && mr->hide_poly[mp_index]; + const bool poly_hidden = mr->hide_poly && mr->hide_poly[mp_index]; const MLoop *mloop = mr->mloop; const int ml_index_end = mp->loopstart + mp->totloop; @@ -100,7 +100,7 @@ static void extract_pos_nor_iter_poly_mesh(const MeshRenderData *mr, copy_v3_v3(vert->pos, mv->co); vert->nor = data->normals[ml->v].low; /* Flag for paint mode overlay. */ - if (face_hidden || vert_hidden || + if (poly_hidden || vert_hidden || ((mr->extract_type == MR_EXTRACT_MAPPED) && (mr->v_origindex) && (mr->v_origindex[ml->v] == ORIGINDEX_NONE))) { vert->nor.w = -1; @@ -434,7 +434,7 @@ static void extract_pos_nor_hq_iter_poly_mesh(const MeshRenderData *mr, void *_data) { MeshExtract_PosNorHQ_Data *data = static_cast<MeshExtract_PosNorHQ_Data *>(_data); - const bool face_hidden = mr->hide_poly && mr->hide_poly[mp - mr->mpoly]; + const bool poly_hidden = mr->hide_poly && mr->hide_poly[mp - mr->mpoly]; const MLoop *mloop = mr->mloop; const int ml_index_end = mp->loopstart + mp->totloop; @@ -448,7 +448,7 @@ static void extract_pos_nor_hq_iter_poly_mesh(const MeshRenderData *mr, copy_v3_v3_short(vert->nor, data->normals[ml->v].high); /* Flag for paint mode overlay. */ - if (face_hidden || vert_hidden || + if (poly_hidden || vert_hidden || ((mr->extract_type == MR_EXTRACT_MAPPED) && (mr->v_origindex) && (mr->v_origindex[ml->v] == ORIGINDEX_NONE))) { vert->nor[3] = -1; |