diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-14 13:39:52 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-14 13:39:52 +0300 |
| commit | 4bf751be7012827758b5b2ae844e370028921bd2 (patch) | |
| tree | 40102707050faa5742a7e435a7f3d68804fa53a1 /source/blender/makesdna/DNA_modifier_types.h | |
| parent | a671aa922a1591128f0a1478c29af39ff6eca61f (diff) | |
| parent | 66407e15cb5136bdbed45b9e0576b1e9863c3f4f (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/modifiers/intern/MOD_normal_edit.c
source/blender/windowmanager/intern/wm_files.c
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 93ab7a035bc..fd05f5584ec 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -1567,6 +1567,7 @@ enum { enum { MOD_NORMALEDIT_INVERT_VGROUP = (1 << 0), MOD_NORMALEDIT_USE_DIRECTION_PARALLEL = (1 << 1), + MOD_NORMALEDIT_NO_POLYNORS_FIX = (1 << 2), }; /* NormalEditModifierData.mix_mode */ |