diff options
author | YimingWu <xp8110@outlook.com> | 2019-08-09 04:56:08 +0300 |
---|---|---|
committer | YimingWu <xp8110@outlook.com> | 2019-08-09 04:56:08 +0300 |
commit | b6cc0d0e1c88106147143f7e80c8fffb063c64c1 (patch) | |
tree | aabc5522b8afd29b5c25eaf8114eb4fff6e12c00 /source | |
parent | b6fa99e21908dda402407c00ad22db87d67ac02b (diff) |
LANPR: Rename Freestyle face/edge mark structures into LANPR.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/data_transfer.c | 4 | ||||
-rw-r--r-- | source/blender/draw/engines/lanpr/lanpr_dpix.c | 4 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_cache_impl_mesh.c | 8 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_common.c | 4 | ||||
-rw-r--r-- | source/blender/editors/include/UI_resources.h | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/resources.c | 4 | ||||
-rw-r--r-- | source/blender/editors/lanpr/lanpr_cpu.c | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_path.c | 10 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_select_similar.c | 16 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 12 | ||||
-rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp | 10 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_meshdata_types.h | 16 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_mesh.c | 20 |
14 files changed, 62 insertions, 62 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 4851e883317..770d8662743 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -1612,9 +1612,9 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = { NULL, layerDefault_mvert_skin}, /* 37: CD_LANPR_EDGE */ - {sizeof(FreestyleEdge), "FreestyleEdge", 1, NULL, NULL, NULL, NULL, NULL, NULL}, + {sizeof(LanprEdge), "LanprEdge", 1, NULL, NULL, NULL, NULL, NULL, NULL}, /* 38: CD_LANPR_FACE */ - {sizeof(FreestyleFace), "FreestyleFace", 1, NULL, NULL, NULL, NULL, NULL, NULL}, + {sizeof(LanprFace), "LanprFace", 1, NULL, NULL, NULL, NULL, NULL, NULL}, /* 39: CD_MLOOPTANGENT */ {sizeof(float[4]), "", 0, NULL, NULL, NULL, NULL, NULL, NULL}, /* 40: CD_TESSLOOPNORMAL */ @@ -1663,8 +1663,8 @@ static const char *LAYERTYPENAMES[CD_NUMTYPES] = { "CDPaintMask", /* 35-36 */ "CDGridPaintMask", "CDMVertSkin", - /* 37-38 */ "CDFreestyleEdge", - "CDFreestyleFace", + /* 37-38 */ "CDLanprEdge", + "CDLanprFace", /* 39-41 */ "CDMLoopTangent", "CDTessLoopNormal", "CDCustomLoopNormal", diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c index 4d5f78a17a9..3dc025bdcf2 100644 --- a/source/blender/blenkernel/intern/data_transfer.c +++ b/source/blender/blenkernel/intern/data_transfer.c @@ -520,10 +520,10 @@ static void data_transfer_layersmapping_add_item_cd(ListBase *r_map, uint64_t data_flag = 0; if (cddata_type == CD_LANPR_EDGE) { - data_flag = FREESTYLE_EDGE_MARK; + data_flag = LANPR_EDGE_MARK; } else if (cddata_type == CD_LANPR_FACE) { - data_flag = FREESTYLE_FACE_MARK; + data_flag = LANPR_FACE_MARK; } data_transfer_layersmapping_add_item(r_map, diff --git a/source/blender/draw/engines/lanpr/lanpr_dpix.c b/source/blender/draw/engines/lanpr/lanpr_dpix.c index 7e394f370e0..69ac52fc1fb 100644 --- a/source/blender/draw/engines/lanpr/lanpr_dpix.c +++ b/source/blender/draw/engines/lanpr/lanpr_dpix.c @@ -159,7 +159,7 @@ int lanpr_feed_atlas_data_obj(void *UNUSED(vedata), struct BMVert *v1, *v2; struct BMEdge *e; struct BMLoop *l1, *l2; - FreestyleEdge *fe; + LanprEdge *fe; int CanFindFreestyle = 0; int edge_count = me->totedge; int i, idx; @@ -216,7 +216,7 @@ int lanpr_feed_atlas_data_obj(void *UNUSED(vedata), if (CanFindFreestyle) { fe = CustomData_bmesh_get(&bm->edata, e->head.data, CD_LANPR_EDGE); - if (fe->flag & FREESTYLE_EDGE_MARK) { + if (fe->flag & LANPR_EDGE_MARK) { AtlasEdgeMask[idx + 1] = 1; /* channel G */ } } diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index a017133185f..cbfaf76969b 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -1653,8 +1653,8 @@ static uchar mesh_render_data_face_flag(MeshRenderData *rdata, const BMFace *efa #ifdef WITH_FREESTYLE if (rdata->cd.offset.freestyle_face != -1) { - const FreestyleFace *ffa = BM_ELEM_CD_GET_VOID_P(efa, rdata->cd.offset.freestyle_face); - if (ffa->flag & FREESTYLE_FACE_MARK) { + const LanprFace *ffa = BM_ELEM_CD_GET_VOID_P(efa, rdata->cd.offset.freestyle_face); + if (ffa->flag & LANPR_FACE_MARK) { fflag |= VFLAG_FACE_FREESTYLE; } } @@ -1718,8 +1718,8 @@ static void mesh_render_data_edge_flag(const MeshRenderData *rdata, } #ifdef WITH_FREESTYLE if (rdata->cd.offset.freestyle_edge != -1) { - const FreestyleEdge *fed = BM_ELEM_CD_GET_VOID_P(eed, rdata->cd.offset.freestyle_edge); - if (fed->flag & FREESTYLE_EDGE_MARK) { + const LanprEdge *fed = BM_ELEM_CD_GET_VOID_P(eed, rdata->cd.offset.freestyle_edge); + if (fed->flag & LANPR_EDGE_MARK) { eattr->e_flag |= VFLAG_EDGE_FREESTYLE; } } diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index ac3e7e4ce67..e3867eef8d8 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -97,8 +97,8 @@ void DRW_globals_update(void) interp_v4_v4v4(gb->colorDupli, gb->colorBackground, gb->colorWire, 0.3f); #ifdef WITH_FREESTYLE - UI_GetThemeColor4fv(TH_FREESTYLE_EDGE_MARK, gb->colorEdgeFreestyle); - UI_GetThemeColor4fv(TH_FREESTYLE_FACE_MARK, gb->colorFaceFreestyle); + UI_GetThemeColor4fv(TH_LANPR_EDGE_MARK, gb->colorEdgeFreestyle); + UI_GetThemeColor4fv(TH_LANPR_FACE_MARK, gb->colorFaceFreestyle); #else zero_v4(gb->colorEdgeFreestyle); zero_v4(gb->colorFaceFreestyle); diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index 3b080b6df95..1db584f0f59 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -250,8 +250,8 @@ typedef enum ThemeColorID { TH_UV_SHADOW, TH_UV_OTHERS, - TH_FREESTYLE_EDGE_MARK, - TH_FREESTYLE_FACE_MARK, + TH_LANPR_EDGE_MARK, + TH_LANPR_FACE_MARK, TH_MATCH, /* highlight color for search matches */ TH_SELECT_HIGHLIGHT, /* highlight color for selected outliner item */ diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index c31de60c7ed..1e74ee50dab 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -537,10 +537,10 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid) case TH_HANDLE_SEL_ALIGN: cp = ts->handle_sel_align; break; - case TH_FREESTYLE_EDGE_MARK: + case TH_LANPR_EDGE_MARK: cp = ts->freestyle_edge_mark; break; - case TH_FREESTYLE_FACE_MARK: + case TH_LANPR_FACE_MARK: cp = ts->freestyle_face_mark; break; diff --git a/source/blender/editors/lanpr/lanpr_cpu.c b/source/blender/editors/lanpr/lanpr_cpu.c index f2cc0be616e..419781f17e4 100644 --- a/source/blender/editors/lanpr/lanpr_cpu.c +++ b/source/blender/editors/lanpr/lanpr_cpu.c @@ -1584,7 +1584,7 @@ static void lanpr_make_render_geometry_buffers_object( LANPR_RenderVert *orv; LANPR_RenderLine *orl; LANPR_RenderTriangle *ort; - FreestyleEdge *fe; + LanprEdge *fe; int CanFindFreestyle = 0; int i; @@ -1661,7 +1661,7 @@ static void lanpr_make_render_geometry_buffers_object( e = BM_edge_at_index(bm, i); if (CanFindFreestyle) { fe = CustomData_bmesh_get(&bm->edata, e->head.data, CD_LANPR_EDGE); - if (fe->flag & FREESTYLE_EDGE_MARK) { + if (fe->flag & LANPR_EDGE_MARK) { rl->flags |= LANPR_EDGE_FLAG_EDGE_MARK; } } diff --git a/source/blender/editors/mesh/editmesh_path.c b/source/blender/editors/mesh/editmesh_path.c index 478fbec8ea6..3040ea44890 100644 --- a/source/blender/editors/mesh/editmesh_path.c +++ b/source/blender/editors/mesh/editmesh_path.c @@ -302,8 +302,8 @@ static bool edgetag_test_cb(BMEdge *e, void *user_data_v) case EDGE_MODE_TAG_BEVEL: return BM_elem_float_data_get(&bm->edata, e, CD_BWEIGHT) ? true : false; case EDGE_MODE_TAG_FREESTYLE: { - FreestyleEdge *fed = CustomData_bmesh_get(&bm->edata, e->head.data, CD_LANPR_EDGE); - return (!fed) ? false : (fed->flag & FREESTYLE_EDGE_MARK) ? true : false; + LanprEdge *fed = CustomData_bmesh_get(&bm->edata, e->head.data, CD_LANPR_EDGE); + return (!fed) ? false : (fed->flag & LANPR_EDGE_MARK) ? true : false; } } return 0; @@ -331,13 +331,13 @@ static void edgetag_set_cb(BMEdge *e, bool val, void *user_data_v) BM_elem_float_data_set(&bm->edata, e, CD_BWEIGHT, (val) ? 1.0f : 0.0f); break; case EDGE_MODE_TAG_FREESTYLE: { - FreestyleEdge *fed; + LanprEdge *fed; fed = CustomData_bmesh_get(&bm->edata, e->head.data, CD_LANPR_EDGE); if (!val) { - fed->flag &= ~FREESTYLE_EDGE_MARK; + fed->flag &= ~LANPR_EDGE_MARK; } else { - fed->flag |= FREESTYLE_EDGE_MARK; + fed->flag |= LANPR_EDGE_MARK; } break; } diff --git a/source/blender/editors/mesh/editmesh_select_similar.c b/source/blender/editors/mesh/editmesh_select_similar.c index 94b2981ff62..02ec903dcdf 100644 --- a/source/blender/editors/mesh/editmesh_select_similar.c +++ b/source/blender/editors/mesh/editmesh_select_similar.c @@ -297,9 +297,9 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) break; } case SIMFACE_FREESTYLE: { - FreestyleFace *fface; + LanprFace *fface; fface = CustomData_bmesh_get(&bm->pdata, face->head.data, CD_LANPR_FACE); - if ((fface == NULL) || ((fface->flag & FREESTYLE_FACE_MARK) == 0)) { + if ((fface == NULL) || ((fface->flag & LANPR_FACE_MARK) == 0)) { face_data_value |= SIMFACE_DATA_FALSE; } else { @@ -459,7 +459,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) } break; case SIMFACE_FREESTYLE: { - FreestyleFace *fface; + LanprFace *fface; if (!has_custom_data_layer) { BLI_assert(face_data_value == SIMFACE_DATA_FALSE); @@ -468,7 +468,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) } fface = CustomData_bmesh_get(&bm->pdata, face->head.data, CD_LANPR_FACE); - if (((fface != NULL) && (fface->flag & FREESTYLE_FACE_MARK)) == + if (((fface != NULL) && (fface->flag & LANPR_FACE_MARK)) == ((face_data_value & SIMFACE_DATA_TRUE) != 0)) { select = true; } @@ -745,9 +745,9 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) } break; case SIMEDGE_FREESTYLE: { - FreestyleEdge *fedge; + LanprEdge *fedge; fedge = CustomData_bmesh_get(&bm->edata, edge->head.data, CD_LANPR_EDGE); - if ((fedge == NULL) || ((fedge->flag & FREESTYLE_EDGE_MARK) == 0)) { + if ((fedge == NULL) || ((fedge->flag & LANPR_EDGE_MARK) == 0)) { edge_data_value |= SIMEDGE_DATA_FALSE; } else { @@ -877,7 +877,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) } break; case SIMEDGE_FREESTYLE: { - FreestyleEdge *fedge; + LanprEdge *fedge; if (!has_custom_data_layer) { BLI_assert(edge_data_value == SIMEDGE_DATA_FALSE); @@ -886,7 +886,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) } fedge = CustomData_bmesh_get(&bm->edata, edge->head.data, CD_LANPR_EDGE); - if (((fedge != NULL) && (fedge->flag & FREESTYLE_EDGE_MARK)) == + if (((fedge != NULL) && (fedge->flag & LANPR_EDGE_MARK)) == ((edge_data_value & SIMEDGE_DATA_TRUE) != 0)) { select = true; } diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 8d15d956e5c..8566c9d0fea 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -7427,7 +7427,7 @@ static int edbm_mark_lanpr_edge_exec(bContext *C, wmOperator *op) { BMEdge *eed; BMIter iter; - FreestyleEdge *fed; + LanprEdge *fed; const bool clear = RNA_boolean_get(op->ptr, "clear"); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -7456,7 +7456,7 @@ static int edbm_mark_lanpr_edge_exec(bContext *C, wmOperator *op) BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { fed = CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_LANPR_EDGE); - fed->flag &= ~FREESTYLE_EDGE_MARK; + fed->flag &= ~LANPR_EDGE_MARK; } } } @@ -7464,7 +7464,7 @@ static int edbm_mark_lanpr_edge_exec(bContext *C, wmOperator *op) BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { fed = CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_LANPR_EDGE); - fed->flag |= FREESTYLE_EDGE_MARK; + fed->flag |= LANPR_EDGE_MARK; } } } @@ -7507,7 +7507,7 @@ static int edbm_mark_lanpr_face_exec(bContext *C, wmOperator *op) { BMFace *efa; BMIter iter; - FreestyleFace *ffa; + LanprFace *ffa; const bool clear = RNA_boolean_get(op->ptr, "clear"); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -7534,7 +7534,7 @@ static int edbm_mark_lanpr_face_exec(bContext *C, wmOperator *op) BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_SELECT) && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { ffa = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_LANPR_FACE); - ffa->flag &= ~FREESTYLE_FACE_MARK; + ffa->flag &= ~LANPR_FACE_MARK; } } } @@ -7542,7 +7542,7 @@ static int edbm_mark_lanpr_face_exec(bContext *C, wmOperator *op) BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_SELECT) && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { ffa = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_LANPR_FACE); - ffa->flag |= FREESTYLE_FACE_MARK; + ffa->flag |= LANPR_FACE_MARK; } } } diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp index 7f35ba08233..d20da1ca377 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp @@ -392,7 +392,7 @@ int BlenderFileLoader::testDegenerateTriangle(float v1[3], float v2[3], float v3 return 0; } -static bool testEdgeMark(Mesh *me, FreestyleEdge *fed, const MLoopTri *lt, int i) +static bool testEdgeMark(Mesh *me, LanprEdge *fed, const MLoopTri *lt, int i) { MLoop *mloop = &me->mloop[lt->tri[i]]; MLoop *mloop_next = &me->mloop[lt->tri[(i + 1) % 3]]; @@ -403,7 +403,7 @@ static bool testEdgeMark(Mesh *me, FreestyleEdge *fed, const MLoopTri *lt, int i return false; } - return (fed[mloop->e].flag & FREESTYLE_EDGE_MARK) != 0; + return (fed[mloop->e].flag & LANPR_EDGE_MARK) != 0; } void BlenderFileLoader::insertShapeNode(Object *ob, Mesh *me, int id) @@ -427,8 +427,8 @@ void BlenderFileLoader::insertShapeNode(Object *ob, Mesh *me, int id) MVert *mvert = me->mvert; MLoop *mloop = me->mloop; MPoly *mpoly = me->mpoly; - FreestyleEdge *fed = (FreestyleEdge *)CustomData_get_layer(&me->edata, CD_LANPR_EDGE); - FreestyleFace *ffa = (FreestyleFace *)CustomData_get_layer(&me->pdata, CD_LANPR_FACE); + LanprEdge *fed = (LanprEdge *)CustomData_get_layer(&me->edata, CD_LANPR_EDGE); + LanprFace *ffa = (LanprFace *)CustomData_get_layer(&me->pdata, CD_LANPR_FACE); // Compute view matrix Object *ob_camera_eval = DEG_get_evaluated_object(_depsgraph, RE_GetCamera(_re)); @@ -559,7 +559,7 @@ void BlenderFileLoader::insertShapeNode(Object *ob, Mesh *me, int id) continue; } - bool fm = (ffa) ? (ffa[lt->poly].flag & FREESTYLE_FACE_MARK) != 0 : false; + bool fm = (ffa) ? (ffa[lt->poly].flag & LANPR_FACE_MARK) != 0 : false; bool em1 = false, em2 = false, em3 = false; if (fed) { diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index 88eef05f8be..f924368de1d 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -369,24 +369,24 @@ typedef struct MVertSkin { int flag; } MVertSkin; -typedef struct FreestyleEdge { +typedef struct LanprEdge { char flag; char _pad[3]; -} FreestyleEdge; +} LanprEdge; -/* FreestyleEdge->flag */ +/* LanprEdge->flag */ enum { - FREESTYLE_EDGE_MARK = 1, + LANPR_EDGE_MARK = 1, }; -typedef struct FreestyleFace { +typedef struct LanprFace { char flag; char _pad[3]; -} FreestyleFace; +} LanprFace; -/* FreestyleFace->flag */ +/* LanprFace->flag */ enum { - FREESTYLE_FACE_MARK = 1, + LANPR_FACE_MARK = 1, }; /* mvert->flag */ diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 54a91227062..c5923b6c08d 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -603,25 +603,25 @@ static bool rna_MEdge_freestyle_edge_mark_get(PointerRNA *ptr) { Mesh *me = rna_mesh(ptr); MEdge *medge = (MEdge *)ptr->data; - FreestyleEdge *fed = CustomData_get(&me->edata, (int)(medge - me->medge), CD_LANPR_EDGE); + LanprEdge *fed = CustomData_get(&me->edata, (int)(medge - me->medge), CD_LANPR_EDGE); - return fed && (fed->flag & FREESTYLE_EDGE_MARK) != 0; + return fed && (fed->flag & LANPR_EDGE_MARK) != 0; } static void rna_MEdge_freestyle_edge_mark_set(PointerRNA *ptr, bool value) { Mesh *me = rna_mesh(ptr); MEdge *medge = (MEdge *)ptr->data; - FreestyleEdge *fed = CustomData_get(&me->edata, (int)(medge - me->medge), CD_LANPR_EDGE); + LanprEdge *fed = CustomData_get(&me->edata, (int)(medge - me->medge), CD_LANPR_EDGE); if (!fed) { fed = CustomData_add_layer(&me->edata, CD_LANPR_EDGE, CD_CALLOC, NULL, me->totedge); } if (value) { - fed->flag |= FREESTYLE_EDGE_MARK; + fed->flag |= LANPR_EDGE_MARK; } else { - fed->flag &= ~FREESTYLE_EDGE_MARK; + fed->flag &= ~LANPR_EDGE_MARK; } } @@ -629,25 +629,25 @@ static bool rna_MPoly_freestyle_face_mark_get(PointerRNA *ptr) { Mesh *me = rna_mesh(ptr); MPoly *mpoly = (MPoly *)ptr->data; - FreestyleFace *ffa = CustomData_get(&me->pdata, (int)(mpoly - me->mpoly), CD_LANPR_FACE); + LanprFace *ffa = CustomData_get(&me->pdata, (int)(mpoly - me->mpoly), CD_LANPR_FACE); - return ffa && (ffa->flag & FREESTYLE_FACE_MARK) != 0; + return ffa && (ffa->flag & LANPR_FACE_MARK) != 0; } static void rna_MPoly_freestyle_face_mark_set(PointerRNA *ptr, int value) { Mesh *me = rna_mesh(ptr); MPoly *mpoly = (MPoly *)ptr->data; - FreestyleFace *ffa = CustomData_get(&me->pdata, (int)(mpoly - me->mpoly), CD_LANPR_FACE); + LanprFace *ffa = CustomData_get(&me->pdata, (int)(mpoly - me->mpoly), CD_LANPR_FACE); if (!ffa) { ffa = CustomData_add_layer(&me->pdata, CD_LANPR_FACE, CD_CALLOC, NULL, me->totpoly); } if (value) { - ffa->flag |= FREESTYLE_FACE_MARK; + ffa->flag |= LANPR_FACE_MARK; } else { - ffa->flag &= ~FREESTYLE_FACE_MARK; + ffa->flag &= ~LANPR_FACE_MARK; } } |