bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Vertex/weight paint: remove "Use All Faces" option.

Browse Source 
This is now always enabled, when you want to paint on a individual faces you
can use face selection masking instead.

Fixes T37855.
This commit is contained in:
Brecht Van Lommel 2013-12-18 17:49:01 +01:00
parent d9e8537d9b
commit fd0825e7c4
4 changed files with 11 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/space_view3d_toolbar.py
View File

@ -1155,7 +1155,6 @@ class VIEW3D_PT_tools_weightpaint_options(Panel, View3DPaintPanel):
col = layout.column()
row = col.row()
row.prop(wpaint, "use_all_faces")
row.prop(wpaint, "use_normal")
col = layout.column()
row = col.row()
@ -1193,7 +1192,6 @@ class VIEW3D_PT_tools_vertexpaint(Panel, View3DPaintPanel):
col = layout.column()
row = col.row()
#col.prop(vpaint, "mode", text="")
row.prop(vpaint, "use_all_faces")
row.prop(vpaint, "use_normal")
col.prop(vpaint, "use_spray")

37
source/blender/editors/sculpt_paint/paint_vertex.c
View File

@ -188,10 +188,7 @@ static VPaint *new_vpaint(int wpaint)
{
VPaint *vp = MEM_callocN(sizeof(VPaint), "VPaint");
vp->flag = VP_AREA + VP_SPRAY;
if (wpaint)
vp->flag = VP_AREA;
vp->flag = (wpaint) ? 0 : VP_SPRAY;
return vp;
}
@ -2344,23 +2341,16 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
/* which faces are involved */
if (use_depth) {
if (wp->flag & VP_AREA) {
char editflag_prev = me->editflag;
char editflag_prev = me->editflag;
/* Ugly hack, to avoid drawing vertex index when getting the face index buffer - campbell */
me->editflag &= ~ME_EDIT_PAINT_VERT_SEL;
if (use_vert_sel) {
/* Ugly x2, we need this so hidden faces don't draw */
me->editflag |= ME_EDIT_PAINT_FACE_SEL;
}
totindex = sample_backbuf_area(vc, indexar, me->totpoly, mval[0], mval[1], brush_size_pressure);
me->editflag = editflag_prev;
}
else {
indexar[0] = view3d_sample_backbuf(vc, mval[0], mval[1]);
if (indexar[0]) totindex = 1;
else totindex = 0;
/* Ugly hack, to avoid drawing vertex index when getting the face index buffer - campbell */
me->editflag &= ~ME_EDIT_PAINT_VERT_SEL;
if (use_vert_sel) {
/* Ugly x2, we need this so hidden faces don't draw */
me->editflag |= ME_EDIT_PAINT_FACE_SEL;
}
totindex = sample_backbuf_area(vc, indexar, me->totpoly, mval[0], mval[1], brush_size_pressure);
me->editflag = editflag_prev;
if (use_face_sel && me->totpoly) {
MPoly *mpoly = me->mpoly;
@ -2996,14 +2986,7 @@ static void vpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
mul_m4_m4m4(mat, vc->rv3d->persmat, ob->obmat);
/* which faces are involved */
if (vp->flag & VP_AREA) {
totindex = sample_backbuf_area(vc, indexar, me->totpoly, mval[0], mval[1], brush_size_pressure);
}
else {
indexar[0] = view3d_sample_backbuf(vc, mval[0], mval[1]);
if (indexar[0]) totindex = 1;
else totindex = 0;
}
totindex = sample_backbuf_area(vc, indexar, me->totpoly, mval[0], mval[1], brush_size_pressure);
if ((me->editflag & ME_EDIT_PAINT_FACE_SEL) && me->mpoly) {
for (index = 0; index < totindex; index++) {

2
source/blender/makesdna/DNA_scene_types.h
View File

@ -880,7 +880,7 @@ typedef struct VPaint {
/* VPaint.flag */
enum {
// VP_COLINDEX = (1 << 0), /* only paint onto active material*/ /* deprecated since before 2.49 */
VP_AREA = (1 << 1),
// VP_AREA = (1 << 1), /* deprecated since 2.70 */
VP_NORMALS = (1 << 3),
VP_SPRAY = (1 << 4),
// VP_MIRROR_X = (1 << 5), /* deprecated in 2.5x use (me->editflag & ME_EDIT_MIRROR_X) */

5
source/blender/makesrna/intern/rna_sculpt_paint.c
View File

@ -464,11 +464,6 @@ static void rna_def_vertex_paint(BlenderRNA *brna)
RNA_def_struct_ui_text(srna, "Vertex Paint", "Properties of vertex and weight paint mode");
/* vertex paint only */
prop = RNA_def_property(srna, "use_all_faces", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", VP_AREA);
RNA_def_property_ui_text(prop, "All Faces", "Paint on all faces inside brush");
RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL);
prop = RNA_def_property(srna, "use_normal", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", VP_NORMALS);
RNA_def_property_ui_text(prop, "Normals", "Apply the vertex normal before painting");