diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-07-16 17:18:43 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-07-16 17:18:43 +0300 |
| commit | dc123ac9e5a135f018ebceda4d282346a8bba094 (patch) | |
| tree | 46956d1312804c51550cc86df3f8099eec9663aa /source/blender/makesdna/DNA_meshdata_types.h | |
| parent | 3465013bb7d6c211d9d5acbba7cf47697f63ba9e (diff) | |
| parent | 1e1c858cf1bf900f0876b13f922beb0e2aeb0e8c (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 | 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 551ba945253..7d79242016f 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -385,7 +385,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), }; |