diff options
| author | Rohan Rathi <rohanrathi08@gmail.com> | 2018-08-09 17:22:07 +0300 |
|---|---|---|
| committer | Rohan Rathi <rohanrathi08@gmail.com> | 2018-08-09 17:22:07 +0300 |
| commit | 2b41b208c7e5e74a0a5fe043f4bfab2a122a9ed1 (patch) | |
| tree | cc5c8948a12a73d3997f8323044d2c117a7af8df /source/blender/makesdna/DNA_scene_types.h | |
| parent | 85cac2221c543e67a9070c94d89d61bf27c7190f (diff) | |
| parent | fea5f26ea56acd73d043e97a96d06067b24ef811 (diff) | |
Merge branch 'soc-2018-bevel' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 5a5614b775e..13de7f9829e 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1349,6 +1349,10 @@ typedef struct ToolSettings { struct CurvePaintSettings curve_paint_settings; struct MeshStatVis statvis; + + /* Normal Editing */ + float normal_vector[3]; + int face_strength; } ToolSettings; /* *************************************************************** */ @@ -1884,6 +1888,13 @@ enum { OB_DRAW_GROUPUSER_ALL = 2 }; +/* toolsettings->face_strength */ +enum { + FACE_STRENGTH_WEAK = -16384, + FACE_STRENGTH_MEDIUM = 0, + FACE_STRENGTH_STRONG = 16384, +}; + /* object_vgroup.c */ /* ToolSettings.vgroupsubset */ typedef enum eVGroupSelect { |