[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50345] trunk/blender/source/blender/ editors/sculpt_paint/paint_ops.c: Fix #32461: adjusting brush strength with shift+F in image editor would show

Brecht Van Lommel brechtvanlommel at pandora.be
Mon Sep 3 13:55:31 CEST 2012


Revision: 50345
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50345
Author:   blendix
Date:     2012-09-03 11:55:30 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
Fix #32461: adjusting brush strength with shift+F in image editor would show
the cursor too big when zoomed in. Only the size adjusment needs to follow the
zoom level of the editor, others are fixed size.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c	2012-09-03 11:38:22 UTC (rev 50344)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c	2012-09-03 11:55:30 UTC (rev 50345)
@@ -584,19 +584,21 @@
                                                  RCFlags flags)
 {
 	wmKeyMapItem *kmi;
+	/* only size needs to follow zoom, strength shows fixed size circle */
+	int flags_nozoom = flags & (~RC_ZOOM);
 
 	kmi = WM_keymap_add_item(keymap, "WM_OT_radial_control", FKEY, KM_PRESS, 0, 0);
 	set_brush_rc_props(kmi->ptr, paint, "size", "use_unified_size", flags);
 
 	kmi = WM_keymap_add_item(keymap, "WM_OT_radial_control", FKEY, KM_PRESS, KM_SHIFT, 0);
-	set_brush_rc_props(kmi->ptr, paint, "strength", "use_unified_strength", flags);
+	set_brush_rc_props(kmi->ptr, paint, "strength", "use_unified_strength", flags_nozoom);
 
 	kmi = WM_keymap_add_item(keymap, "WM_OT_radial_control", WKEY, KM_PRESS, 0, 0);
-	set_brush_rc_props(kmi->ptr, paint, "weight", "use_unified_weight", flags);
+	set_brush_rc_props(kmi->ptr, paint, "weight", "use_unified_weight", flags_nozoom);
 
 	if (flags & RC_ROTATION) {
 		kmi = WM_keymap_add_item(keymap, "WM_OT_radial_control", FKEY, KM_PRESS, KM_CTRL, 0);
-		set_brush_rc_props(kmi->ptr, paint, "texture_slot.angle", NULL, flags);
+		set_brush_rc_props(kmi->ptr, paint, "texture_slot.angle", NULL, flags_nozoom);
 	}
 }
 




More information about the Bf-blender-cvs mailing list