Merged changes in the trunk up to revision 30952.
[blender-staging.git] / source / blender / makesdna / DNA_scene_types.h
index cf1ec0131f0ed1604b0300b0e4f4d510f44164ee..d58bc3aa9bcc662d0c6719ac0d055264495a9d73 100644 (file)
@@ -729,11 +729,13 @@ typedef struct ToolSettings {
        /* Transform */
        short snap_mode, snap_flag, snap_target;
        short proportional, prop_mode;
+       char proportional_objects; /* proportional edit, object mode */
+       char pad[3];
 
-       int auto_normalize, intpad; /*auto normalizing mode in wpaint*/
+       int auto_normalize; /*auto normalizing mode in wpaint*/
 
        short sculpt_paint_settings; /* user preferences for sculpt and paint */
-       short pad;
+       short pad1;
        int sculpt_paint_unified_size; /* unified radius of brush in pixels */
        float sculpt_paint_unified_unprojected_radius;/* unified radius of brush in Blender units */
        float sculpt_paint_unified_alpha; /* unified strength of brush */