diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-26 03:29:16 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-26 03:30:34 +0300 |
| commit | 07747bcd67b6c8a829febeb34b64c47d0ad8a344 (patch) | |
| tree | acc4c2392eb45b1896f0b5f0ec1bdba7352a2614 /source/blender/bmesh/intern/bmesh_opdefines.c | |
| parent | c72380a427a4af9cacafc0e6bfe8f0f40c8e6dc5 (diff) | |
| parent | 34d98cfe61bd34aa742879a31ba0da01d32d7e3a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_opdefines.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_opdefines.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index ceeea9de76b..d1366d24b5b 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -1465,6 +1465,7 @@ static BMOpDefine bmo_spin_def = { {"angle", BMO_OP_SLOT_FLT}, /* total rotation angle (radians) */ {"space", BMO_OP_SLOT_MAT}, /* matrix to define the space (typically object matrix) */ {"steps", BMO_OP_SLOT_INT}, /* number of steps */ + {"use_merge", BMO_OP_SLOT_BOOL}, /* Merge first/last when the angle is a full revolution. */ {"use_normal_flip", BMO_OP_SLOT_BOOL}, /* Create faces with reversed direction. */ {"use_duplicate", BMO_OP_SLOT_BOOL}, /* duplicate or extrude? */ {{'\0'}}, |