3 files changed, 12 insertions, 13 deletions
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h
index 415eb03e26d..9799489982d 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -139,8 +139,8 @@ typedef enum CustomDataType {
   CD_PAINT_MASK = 34,
   CD_GRID_PAINT_MASK = 35,
   CD_MVERT_SKIN = 36,
-  CD_LANPR_EDGE = 37,
-  CD_LANPR_FACE = 38,
+  CD_FREESTYLE_EDGE = 37,
+  CD_FREESTYLE_FACE = 38,
   CD_MLOOPTANGENT = 39,
   CD_TESSLOOPNORMAL = 40,
   CD_CUSTOMLOOPNORMAL = 41,
@@ -188,8 +188,8 @@ typedef enum CustomDataType {
 #define CD_MASK_PAINT_MASK (1LL << CD_PAINT_MASK)
 #define CD_MASK_GRID_PAINT_MASK (1LL << CD_GRID_PAINT_MASK)
 #define CD_MASK_MVERT_SKIN (1LL << CD_MVERT_SKIN)
-#define CD_MASK_FREESTYLE_EDGE (1LL << CD_LANPR_EDGE)
-#define CD_MASK_FREESTYLE_FACE (1LL << CD_LANPR_FACE)
+#define CD_MASK_FREESTYLE_EDGE (1LL << CD_FREESTYLE_EDGE)
+#define CD_MASK_FREESTYLE_FACE (1LL << CD_FREESTYLE_FACE)
 #define CD_MASK_MLOOPTANGENT (1LL << CD_MLOOPTANGENT)
 #define CD_MASK_TESSLOOPNORMAL (1LL << CD_TESSLOOPNORMAL)
 #define CD_MASK_CUSTOMLOOPNORMAL (1LL << CD_CUSTOMLOOPNORMAL)
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 3d309f3c22f..1d1ccef8846 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -27,7 +27,6 @@
 #include "DNA_defs.h"
 #include "DNA_ID.h"
 #include "DNA_listBase.h"
-#include "DNA_lanpr_types.h"
 
 #ifndef MAX_MTEX
 #  define MAX_MTEX 18
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h
index 50402bbdc87..f6a7a8a5f5b 100644
--- a/source/blender/makesdna/DNA_meshdata_types.h
+++ b/source/blender/makesdna/DNA_meshdata_types.h
@@ -363,24 +363,24 @@ typedef struct MVertSkin {
   int flag;
 } MVertSkin;
 
-typedef struct LanprEdge {
+typedef struct FreestyleEdge {
   char flag;
   char _pad[3];
-} LanprEdge;
+} FreestyleEdge;
 
-/* LanprEdge->flag */
+/* FreestyleEdge->flag */
 enum {
-  LANPR_EDGE_MARK = 1,
+  FREESTYLE_EDGE_MARK = 1,
 };
 
-typedef struct LanprFace {
+typedef struct FreestyleFace {
   char flag;
   char _pad[3];
-} LanprFace;
+} FreestyleFace;
 
-/* LanprFace->flag */
+/* FreestyleFace->flag */
 enum {
-  LANPR_FACE_MARK = 1,
+  FREESTYLE_FACE_MARK = 1,
 };
 
 /* mvert->flag */