Merge branch 'blender2.8' into soc-2018-bevel
[blender.git] / source / blender / makesdna / DNA_scene_types.h
index 0c2169072d34237cd76a39c7180e19b495c2fa46..7d26fc6af3f5b44c11c636e21b405d1e17fa9cc6 100644 (file)
@@ -1318,6 +1318,10 @@ typedef struct ToolSettings {
        struct CurvePaintSettings curve_paint_settings;
 
        struct MeshStatVis statvis;
+
+       /* Normal Editing */
+       float normal_vector[3];
+       int face_strength;
 } ToolSettings;
 
 /* *************************************************************** */
@@ -1847,6 +1851,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 {