Page MenuHome
Files F22698

group_use_v2.diff
Public
Actions

group_use_v2.diff
View Options

Index: release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- release/scripts/startup/bl_ui/space_view3d_toolbar.py (revision 54553)
+++ release/scripts/startup/bl_ui/space_view3d_toolbar.py (working copy)
@@ -685,6 +685,7 @@
elif context.weight_paint_object and brush:
layout.prop(toolsettings, "use_auto_normalize", text="Auto Normalize")
layout.prop(toolsettings, "use_multipaint", text="Multi-Paint")
+ layout.prop(toolsettings, "use_group_mask", text="Show Group Use")
col = layout.column()
Index: source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- source/blender/blenkernel/intern/DerivedMesh.c (revision 54553)
+++ source/blender/blenkernel/intern/DerivedMesh.c (working copy)
@@ -1018,7 +1018,8 @@
/* draw_flag's for calc_weightpaint_vert_color */
enum {
CALC_WP_MULTIPAINT = (1 << 0),
- CALC_WP_AUTO_NORMALIZE = (1 << 1)
+ CALC_WP_AUTO_NORMALIZE = (1 << 1),
+ CALC_WP_MASKBLACK = (1 << 2)
};
static void weightpaint_color(unsigned char r_col[4], ColorBand *coba, const float input)
@@ -1080,7 +1081,18 @@
}
else {
/* default, non tricky behavior */
- input = defvert_find_weight(dv, defbase_act);
+ MDeformWeight *dw = defvert_find_index(dv, defbase_act);
+ if (dw) {
+ input = dw->weight;
+ }
+ else {
+ if (draw_flag & CALC_WP_MASKBLACK) {
+ make_black = true;
+ }
+ else {
+ input = 0.0f;
+ }
+ }
}
if (make_black) { /* TODO, theme color */
@@ -1355,7 +1367,8 @@
int sculpt_dyntopo = (sculpt_mode && ob->sculpt->bm);
const int draw_flag = ((scene->toolsettings->multipaint ? CALC_WP_MULTIPAINT : 0) |
- (scene->toolsettings->auto_normalize ? CALC_WP_AUTO_NORMALIZE : 0));
+ (scene->toolsettings->auto_normalize ? CALC_WP_AUTO_NORMALIZE : 0) |
+ (scene->toolsettings->maskblack ? CALC_WP_MASKBLACK : 0));
/* Generic preview only in object mode! */
const int do_mod_mcol = (ob->mode == OB_MODE_OBJECT);
#if 0 /* XXX Will re-enable this when we have global mod stack options. */
Index: source/blender/makesdna/DNA_scene_types.h
===================================================================
--- source/blender/makesdna/DNA_scene_types.h (revision 54553)
+++ source/blender/makesdna/DNA_scene_types.h (working copy)
@@ -1033,10 +1033,11 @@
short proportional, prop_mode;
char proportional_objects; /* proportional edit, object mode */
char proportional_mask; /* proportional edit, object mode */
- char pad4[2];
+ char pad4[1];
char auto_normalize; /*auto normalizing mode in wpaint*/
char multipaint; /* paint multiple bones in wpaint */
+ char maskblack;
/* UV painting */
int use_uv_sculpt;
Index: source/blender/makesrna/intern/rna_scene.c
===================================================================
--- source/blender/makesrna/intern/rna_scene.c (revision 54553)
+++ source/blender/makesrna/intern/rna_scene.c (working copy)
@@ -1552,6 +1552,12 @@
"weight painting");
RNA_def_property_update(prop, 0, "rna_Scene_update_active_object_data");
+ prop = RNA_def_property(srna, "use_group_mask", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "maskblack", 1);
+ RNA_def_property_ui_text(prop, "Mask Non-Group Verts",
+ "Color verts not in this group");
+ RNA_def_property_update(prop, 0, "rna_Scene_update_active_object_data");
+
prop = RNA_def_property(srna, "vertex_paint", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "vpaint");
RNA_def_property_ui_text(prop, "Vertex Paint", "");

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
99/25/9f1c152a0e093dc143492b8b2502

Event Timeline