[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56474] trunk/blender: Fix #35190: texture mask stencil Reset Transform did not work properly.

[Brecht Van Lommel]

Revision: 56474
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56474
Author:   blendix
Date:     2013-05-02 17:55:17 +0000 (Thu, 02 May 2013)
Log Message:
-----------
Fix #35190: texture mask stencil Reset Transform did not work properly.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_paint_common.py
    trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_paint_common.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_paint_common.py	2013-05-02 15:10:24 UTC (rev 56473)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_paint_common.py	2013-05-02 17:55:17 UTC (rev 56474)
@@ -131,7 +131,7 @@
     if mask_tex_slot.map_mode == 'STENCIL':
         if brush.mask_texture and brush.mask_texture.type == 'IMAGE':
             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:
         layout.label(text="Mask Mapping:")

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c	2013-05-02 15:10:24 UTC (rev 56473)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c	2013-05-02 17:55:17 UTC (rev 56474)
@@ -826,23 +826,34 @@
 }
 
 
-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);
 	Brush *br = BKE_paint_brush(paint);
+	bool do_mask = RNA_boolean_get(op->ptr, "mask");
 
 	if (!br)
 		return OPERATOR_CANCELLED;
+	
+	if (do_mask) {
+		br->mask_stencil_pos[0] = 256;
+		br->mask_stencil_pos[1] = 256;
 
-	br->stencil_pos[0] = 256;
-	br->stencil_pos[1] = 256;
+		br->mask_stencil_dimension[0] = 256;
+		br->mask_stencil_dimension[1] = 256;
 
-	br->stencil_dimension[0] = 256;
-	br->stencil_dimension[1] = 256;
+		br->mask_mtex.rot = 0;
+	}
+	else {
+		br->stencil_pos[0] = 256;
+		br->stencil_pos[1] = 256;
 
-	br->mtex.rot = 0;
-	br->mask_mtex.rot = 0;
+		br->stencil_dimension[0] = 256;
+		br->stencil_dimension[1] = 256;
 
+		br->mtex.rot = 0;
+	}
+
 	WM_event_add_notifier(C, NC_WINDOW, NULL);
 
 	return OPERATOR_FINISHED;
@@ -862,6 +873,8 @@
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	RNA_def_boolean(ot->srna, "mask", 0, "Modify Mask Stencil", "Modify either the primary or mask stencil");
 }