kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #35190: texture mask stencil Reset Transform did not work properly.

Browse Source
This commit is contained in:
Brecht Van Lommel 2013-05-02 17:55:17 +00:00
parent 12db4f3eae
commit cc86176a60
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,7 +131,7 @@ def brush_mask_texture_settings(layout, brush):
if mask_tex_slot.map_mode == 'STENCIL': if mask_tex_slot.map_mode == 'STENCIL':
if brush.mask_texture and brush.mask_texture.type == 'IMAGE': if brush.mask_texture and brush.mask_texture.type == 'IMAGE':
layout.operator("brush.stencil_fit_image_aspect").mask = True layout.operator("brush.stencil_fit_image_aspect").mask = True
layout.operator("brush.stencil_reset_transform") layout.operator("brush.stencil_reset_transform").mask = True
if brush.mask_texture: if brush.mask_texture:
layout.label(text="Mask Mapping:") layout.label(text="Mask Mapping:")

17
source/blender/editors/sculpt_paint/paint_ops.c
View File

@ -826,14 +826,25 @@ static void BRUSH_OT_stencil_fit_image_aspect(wmOperatorType *ot)
} }
static int stencil_reset_transform(bContext *C, wmOperator *UNUSED(op)) static int stencil_reset_transform(bContext *C, wmOperator *op)
{ {
Paint *paint = BKE_paint_get_active_from_context(C); Paint *paint = BKE_paint_get_active_from_context(C);
Brush *br = BKE_paint_brush(paint); Brush *br = BKE_paint_brush(paint);
bool do_mask = RNA_boolean_get(op->ptr, "mask");
if (!br) if (!br)
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
if (do_mask) {
br->mask_stencil_pos[0] = 256;
br->mask_stencil_pos[1] = 256;
br->mask_stencil_dimension[0] = 256;
br->mask_stencil_dimension[1] = 256;
br->mask_mtex.rot = 0;
}
else {
br->stencil_pos[0] = 256; br->stencil_pos[0] = 256;
br->stencil_pos[1] = 256; br->stencil_pos[1] = 256;
@ -841,7 +852,7 @@ static int stencil_reset_transform(bContext *C, wmOperator *UNUSED(op))
br->stencil_dimension[1] = 256; br->stencil_dimension[1] = 256;
br->mtex.rot = 0; br->mtex.rot = 0;
br->mask_mtex.rot = 0; }
WM_event_add_notifier(C, NC_WINDOW, NULL); WM_event_add_notifier(C, NC_WINDOW, NULL);
@ -862,6 +873,8 @@ static void BRUSH_OT_stencil_reset_transform(wmOperatorType *ot)
/* flags */ /* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
RNA_def_boolean(ot->srna, "mask", 0, "Modify Mask Stencil", "Modify either the primary or mask stencil");
} }