blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Fix incorrect custom-data layer access for hide layers 

Error in [0], missed in review.

[0] 2480b55f21
This commit is contained in:
Campbell Barton 2022-08-12 09:13:14 +10:00
parent 62d1ed0120
commit 282a861e11
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_view3d/view3d_select.c
View File

@ -370,7 +370,7 @@ static bool edbm_backbuf_check_and_select_faces_obmode(Mesh *me,
if (mpoly) {
const bool *hide_poly = (const bool *)CustomData_get_layer_named(
&me->vdata, CD_PROP_BOOL, ".hide_poly");
&me->pdata, CD_PROP_BOOL, ".hide_poly");
for (int index = 0; index < me->totpoly; index++, mpoly++) {
if (!(hide_poly && hide_poly[index])) {

8
source/blender/makesrna/intern/rna_mesh.c
View File

@ -418,7 +418,7 @@ static void rna_MeshVertex_hide_set(PointerRNA *ptr, bool value)
&mesh->vdata, CD_PROP_BOOL, ".hide_vert", mesh->totvert);
if (!hide_vert) {
if (!value) {
/* Skip adding layer if it doesn't exist already anyway and we're not hiding an element.. */
/* Skip adding layer if it doesn't exist already anyway and we're not hiding an element. */
return;
}
hide_vert = (bool *)CustomData_add_layer_named(
@ -552,7 +552,7 @@ static void rna_MeshPolygon_hide_set(PointerRNA *ptr, bool value)
&mesh->pdata, CD_PROP_BOOL, ".hide_poly", mesh->totpoly);
if (!hide_poly) {
if (!value) {
/* Skip adding layer if it doesn't exist already anyway and we're not hiding an element.. */
/* Skip adding layer if it doesn't exist already anyway and we're not hiding an element. */
return;
}
hide_poly = (bool *)CustomData_add_layer_named(
@ -1276,7 +1276,7 @@ static bool rna_MeshEdge_hide_get(PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
const bool *hide_edge = (const bool *)CustomData_get_layer_named(
&mesh->pdata, CD_PROP_BOOL, ".hide_edge");
&mesh->edata, CD_PROP_BOOL, ".hide_edge");
const int index = rna_MeshEdge_index_get(ptr);
return hide_edge == NULL ? false : hide_edge[index];
}
@ -1288,7 +1288,7 @@ static void rna_MeshEdge_hide_set(PointerRNA *ptr, bool value)
&mesh->edata, CD_PROP_BOOL, ".hide_edge", mesh->totedge);
if (!hide_edge) {
if (!value) {
/* Skip adding layer if it doesn't exist already anyway and we're not hiding an element.. */
/* Skip adding layer if it doesn't exist already anyway and we're not hiding an element. */
return;
}
hide_edge = (bool *)CustomData_add_layer_named(