diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-09-03 15:55:30 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-09-03 15:55:30 +0400 |
| commit | 1cb9b1ddf37fcc572622c54bd3c019cd582916b6 (patch) | |
| tree | 59b781d5cd066a118434938085cd2821033e6db5 | |
| parent | 2f708009238664129f69c641e67b6787c6e13a70 (diff) | |
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.
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_ops.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index 104f727c603..cc71be4938e 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -584,19 +584,21 @@ static void ed_keymap_paint_brush_radial_control(wmKeyMap *keymap, const char *p 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); } } |