LANPR: Rename Freestyle face/edge mark structures into LANPR.

3 files changed, 19 insertions, 19 deletions

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;
         }
       }
     }