[Bf-blender-cvs] [49caf35d8aa] hair_object: Add masks for new customdata types.

[Lukas Tönne]

Commit: 49caf35d8aae0a144de4d56e38d3de87ce72d03a
Author: Lukas Tönne
Date:   Sun Nov 25 13:19:46 2018 +0000
Branches: hair_object
https://developer.blender.org/rB49caf35d8aae0a144de4d56e38d3de87ce72d03a

Add masks for new customdata types.

===================================================================

M	source/blender/blenkernel/intern/customdata.c
M	source/blender/makesdna/DNA_customdata_types.h

===================================================================

diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index b0c008ebc38..7bf5e4791f5 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1371,7 +1371,8 @@ const CustomDataMask CD_MASK_EVERYTHING =
     /* BMESH ONLY END */
     CD_MASK_PAINT_MASK | CD_MASK_GRID_PAINT_MASK | CD_MASK_MVERT_SKIN |
     CD_MASK_FREESTYLE_EDGE | CD_MASK_FREESTYLE_FACE |
-    CD_MASK_MLOOPTANGENT | CD_MASK_TESSLOOPNORMAL | CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_FACEMAP;
+    CD_MASK_MLOOPTANGENT | CD_MASK_TESSLOOPNORMAL | CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_FACEMAP |
+    CD_MASK_HAIRVERT | CD_MASK_HAIRCURVE | CD_MASK_HAIRFOLLICLE;
 
 static const LayerTypeInfo *layerType_getInfo(int type)
 {
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h
index a6b28b7ee25..7a733028710 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -181,6 +181,9 @@ typedef enum CustomDataType {
 #define CD_MASK_MLOOPTANGENT    (1LL << CD_MLOOPTANGENT)
 #define CD_MASK_TESSLOOPNORMAL  (1LL << CD_TESSLOOPNORMAL)
 #define CD_MASK_CUSTOMLOOPNORMAL (1LL << CD_CUSTOMLOOPNORMAL)
+#define CD_MASK_HAIRVERT        (1LL << CD_HAIRVERT)
+#define CD_MASK_HAIRCURVE       (1LL << CD_HAIRCURVE)
+#define CD_MASK_HAIRFOLLICLE    (1LL << CD_HAIRFOLLICLE)
 
 /* CustomData.flag */
 enum {