Merged 38568-38822

[blender-staging.git] / source / blender / makesrna / intern / rna_scene.c

diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index f4028e45e965e18bd2a95f4d0e7b4bbf01d78468..048afb594193b8cd88ade71770a74e647ca48083 100644 (file)
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -1090,6 +1090,14 @@ static void rna_def_tool_settings(BlenderRNA  *brna)
        RNA_def_property_ui_text(prop, "WPaint Auto-Normalize", 
                "Ensure all bone-deforming vertex groups add up to 1.0 while "
                 "weight painting");
+       RNA_def_property_update(prop, 0, "rna_update_active_object");
+
+       prop = RNA_def_property(srna, "use_multipaint", PROP_BOOLEAN, PROP_NONE);
+       RNA_def_property_boolean_sdna(prop, NULL, "multipaint", 1);
+       RNA_def_property_ui_text(prop, "WPaint Multi-Paint", 
+               "Paint across all selected bones while "
+                "weight painting");
+       RNA_def_property_update(prop, 0, "rna_update_active_object");
 
        prop= RNA_def_property(srna, "vertex_paint", PROP_POINTER, PROP_NONE);
        RNA_def_property_pointer_sdna(prop, NULL, "vpaint");