Merged changes in the trunk up to revision 34193.
[blender.git] / source / blender / makesdna / DNA_scene_types.h
index 3a8dd13a941c7c644924f87c4689dbd88b0dd856..685d8bca30db12353c482e1c57ac2986497d6550 100644 (file)
@@ -662,8 +662,11 @@ typedef struct ToolSettings {
        short uvcalc_mapalign;
        short uvcalc_flag;
        short uv_flag, uv_selectmode;
-       short uv_pad[2];
-
+       short uv_pad;
+       
+       /* Grease Pencil */
+       short gpencil_flags;
+       
        /* Auto-IK */
        short autoik_chainlen;
 
@@ -1199,6 +1202,9 @@ typedef enum SculptFlags {
 #define EDGE_MODE_TAG_CREASE                   3
 #define EDGE_MODE_TAG_BEVEL                            4
 
+/* toolsettings->gpencil_flags */
+#define GP_TOOL_FLAG_PAINTSESSIONS_ON  (1<<0)
+
 /* toolsettings->particle flag */
 #define PE_KEEP_LENGTHS                        1
 #define PE_LOCK_FIRST                  2