diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-10-17 06:06:49 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-17 06:06:49 +0300 |
commit | 0ffa64a45f7d961cb079a56629bcff105c81eb56 (patch) | |
tree | 238bdd23687e6b54c1f75a35e5497837e8662bea /source/blender/makesdna/DNA_meshdata_types.h | |
parent | dd91d7d09d9994bc20bdbfb501d5101044ac99c8 (diff) | |
parent | 99520e3f92e14eb3b7fab3f7decd0914a3da1360 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_meshdata_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_meshdata_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index d0a3c7bb95a..6d38fe22ea1 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -340,7 +340,7 @@ typedef struct GridPaintMask { int pad; } GridPaintMask; -typedef enum MVertSkinFlag { +typedef enum eMVertSkinFlag { /* Marks a vertex as the edge-graph root, used for calculating rotations for all connected edges (recursively). * Also used to choose a root when generating an armature. */ @@ -350,13 +350,13 @@ typedef enum MVertSkinFlag { * directly hulled together, rather than the default of generating intermediate frames. */ MVERT_SKIN_LOOSE = 2, -} MVertSkinFlag; +} eMVertSkinFlag; typedef struct MVertSkin { /* Radii of the skin, define how big the generated frames are. Currently only the first two elements are used. */ float radius[3]; - /* MVertSkinFlag */ + /* eMVertSkinFlag */ int flag; } MVertSkin; |