Merge remote-tracking branch 'origin/master' into blender2.8
[blender.git] / source / blender / makesdna / DNA_scene_types.h
index a21aee25effc3957809ac256b485fff5eab2754f..a050eee79f173469578a2196a4eb233d71b261c8 100644 (file)
@@ -1127,6 +1127,14 @@ typedef enum eGP_EditBrush_Types {
        TOT_GP_EDITBRUSH_TYPES
 } eGP_EditBrush_Types;
 
+/* Lock axis options */
+typedef enum eGP_Lockaxis_Types {
+       GP_LOCKAXIS_NONE = 0,
+       GP_LOCKAXIS_X = 1,
+       GP_LOCKAXIS_Y = 2,
+       GP_LOCKAXIS_Z = 3
+} eGP_Lockaxis_Types;
+
 /* Settings for a GPencil Stroke Sculpting Brush */
 typedef struct GP_EditBrush_Data {
        short size;             /* radius of brush */
@@ -1157,7 +1165,7 @@ typedef struct GP_BrushEdit_Settings {
        
        int brushtype;                /* eGP_EditBrush_Types */
        int flag;                     /* eGP_BrushEdit_SettingsFlag */
-       char pad[4];
+       int lock_axis;                /* lock drawing to one axis */
        float alpha;                  /* alpha factor for selection color */
 } GP_BrushEdit_Settings;