diff options
| author | L. E. Segovia <leonardo.segovia@cs.uns.edu.ar> | 2018-07-17 18:11:57 +0300 |
|---|---|---|
| committer | L. E. Segovia <leonardo.segovia@cs.uns.edu.ar> | 2018-07-17 18:11:57 +0300 |
| commit | 93b6346f67ae70f2effb33d0d0404d5f5244e4f4 (patch) | |
| tree | 7bd4d0d27a82010af0e551fd4e15b9b6980e7ad8 /source/blender/makesdna/DNA_meshdata_types.h | |
| parent | 28dfe13cd85bd714fc1cf22dfe5792b8e156816e (diff) | |
| parent | efe94793c0854454517f49f833f688e0652f4ec0 (diff) | |
Merge branch 'master' into soc-2018-hair-shadersoc-2018-hair-shader
Week 10 merge: no issues
Diffstat (limited to 'source/blender/makesdna/DNA_meshdata_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_meshdata_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index bda557fc59d..d1c137492de 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -401,7 +401,7 @@ enum { /* SELECT = (1 << 0), */ ME_VERT_TMP_TAG = (1 << 2), ME_HIDE = (1 << 4), - ME_VERT_MERGED = (1 << 6), +/* ME_VERT_MERGED = (1 << 6), */ ME_VERT_PBVH_UPDATE = (1 << 7), }; |