diff options
Diffstat (limited to 'source/blender/editors/mesh/editmesh_select_similar.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_select_similar.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/source/blender/editors/mesh/editmesh_select_similar.c b/source/blender/editors/mesh/editmesh_select_similar.c index 02ec903dcdf..2782cc92aca 100644 --- a/source/blender/editors/mesh/editmesh_select_similar.c +++ b/source/blender/editors/mesh/editmesh_select_similar.c @@ -233,7 +233,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) break; } case SIMFACE_FREESTYLE: { - if (!CustomData_has_layer(&bm->pdata, CD_LANPR_FACE)) { + if (!CustomData_has_layer(&bm->pdata, CD_FREESTYLE_FACE)) { face_data_value |= SIMFACE_DATA_FALSE; continue; } @@ -297,9 +297,9 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) break; } case SIMFACE_FREESTYLE: { - LanprFace *fface; - fface = CustomData_bmesh_get(&bm->pdata, face->head.data, CD_LANPR_FACE); - if ((fface == NULL) || ((fface->flag & LANPR_FACE_MARK) == 0)) { + FreestyleFace *fface; + fface = CustomData_bmesh_get(&bm->pdata, face->head.data, CD_FREESTYLE_FACE); + if ((fface == NULL) || ((fface->flag & FREESTYLE_FACE_MARK) == 0)) { face_data_value |= SIMFACE_DATA_FALSE; } else { @@ -357,7 +357,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) break; } case SIMFACE_FREESTYLE: { - has_custom_data_layer = CustomData_has_layer(&bm->pdata, CD_LANPR_FACE); + has_custom_data_layer = CustomData_has_layer(&bm->pdata, CD_FREESTYLE_FACE); if ((face_data_value == SIMFACE_DATA_TRUE) && !has_custom_data_layer) { continue; } @@ -459,7 +459,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) } break; case SIMFACE_FREESTYLE: { - LanprFace *fface; + FreestyleFace *fface; if (!has_custom_data_layer) { BLI_assert(face_data_value == SIMFACE_DATA_FALSE); @@ -467,8 +467,8 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) break; } - fface = CustomData_bmesh_get(&bm->pdata, face->head.data, CD_LANPR_FACE); - if (((fface != NULL) && (fface->flag & LANPR_FACE_MARK)) == + fface = CustomData_bmesh_get(&bm->pdata, face->head.data, CD_FREESTYLE_FACE); + if (((fface != NULL) && (fface->flag & FREESTYLE_FACE_MARK)) == ((face_data_value & SIMFACE_DATA_TRUE) != 0)) { select = true; } @@ -687,7 +687,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) switch (type) { case SIMEDGE_FREESTYLE: { - if (!CustomData_has_layer(&bm->edata, CD_LANPR_EDGE)) { + if (!CustomData_has_layer(&bm->edata, CD_FREESTYLE_EDGE)) { edge_data_value |= SIMEDGE_DATA_FALSE; continue; } @@ -745,9 +745,9 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) } break; case SIMEDGE_FREESTYLE: { - LanprEdge *fedge; - fedge = CustomData_bmesh_get(&bm->edata, edge->head.data, CD_LANPR_EDGE); - if ((fedge == NULL) || ((fedge->flag & LANPR_EDGE_MARK) == 0)) { + FreestyleEdge *fedge; + fedge = CustomData_bmesh_get(&bm->edata, edge->head.data, CD_FREESTYLE_EDGE); + if ((fedge == NULL) || ((fedge->flag & FREESTYLE_EDGE_MARK) == 0)) { edge_data_value |= SIMEDGE_DATA_FALSE; } else { @@ -790,7 +790,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) bool has_custom_data_layer = false; switch (type) { case SIMEDGE_FREESTYLE: { - has_custom_data_layer = CustomData_has_layer(&bm->edata, CD_LANPR_EDGE); + has_custom_data_layer = CustomData_has_layer(&bm->edata, CD_FREESTYLE_EDGE); if ((edge_data_value == SIMEDGE_DATA_TRUE) && !has_custom_data_layer) { continue; } @@ -877,7 +877,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) } break; case SIMEDGE_FREESTYLE: { - LanprEdge *fedge; + FreestyleEdge *fedge; if (!has_custom_data_layer) { BLI_assert(edge_data_value == SIMEDGE_DATA_FALSE); @@ -885,8 +885,8 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) break; } - fedge = CustomData_bmesh_get(&bm->edata, edge->head.data, CD_LANPR_EDGE); - if (((fedge != NULL) && (fedge->flag & LANPR_EDGE_MARK)) == + fedge = CustomData_bmesh_get(&bm->edata, edge->head.data, CD_FREESTYLE_EDGE); + if (((fedge != NULL) && (fedge->flag & FREESTYLE_EDGE_MARK)) == ((edge_data_value & SIMEDGE_DATA_TRUE) != 0)) { select = true; } |