svn merge -r40000:40179 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / makesdna / DNA_scene_types.h
index 5f20432d6f8cbacf17e86d39fc4ef880b5e390a9..66244e87995edb5a3d496a70bc91b88565646056 100644 (file)
@@ -759,10 +759,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 */