Merged 38568-38822

[blender-staging.git] / source / blender / makesdna / DNA_scene_types.h

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 2211f93a8aebbc304759160e1df154ab7f55e77f..dcf646532c49b822b89d601052499f3f0d870d8e 100644 (file)
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -726,10 +726,13 @@ typedef struct ToolSettings {
        short snap_flag, snap_target;
        short proportional, prop_mode;
        char proportional_objects; /* proportional edit, object mode */
-       char pad[3];
+       char pad[7];
 
        int auto_normalize; /*auto normalizing mode in wpaint*/
 
+       //Jason
+       int multipaint; /* paint multiple bones in wpaint */
+
        short sculpt_paint_settings; /* user preferences for sculpt and paint */
        short pad1;
        int sculpt_paint_unified_size; /* unified radius of brush in pixels */