Blender Git Loki
Git Commits -> Revision 46cd2a6
Revision 46cd2a6 by Sergey Sharybin (master) June 4, 2012, 07:29 (GMT) |
Fix #31093: Brush's "Paint curve presets" in Image paint in UVImage Editor doesn't work if weight paint mode is active Some operators like curve presets, color sample and some more were using object's mode to distinguish in which mode user is currently painting. Such approach fails in cases when there's paint mode active in 3D viewport and Image Editor. Changed logic here to use some context's state like active space which helps distinguishing current paint mode more accurate. Ported all areas which uses paint_get_active() to new paint_get_active_from_context(). There're still some calls to paint_get_active(), but that shouldn't be harmful due to that places indeed have object's mode as priority when getting paint mode. |
Commit Details:
Full Hash: 46cd2a6a38a67c7dfc3e5a8880b6f7f055e50a8a
SVN Revision: 47392
Parent Commit: 4414f38
Lines Changed: +73, -23
10 Modified Paths:
/source/blender/blenkernel/BKE_paint.h (+2, -0) (Diff)
/source/blender/blenkernel/intern/paint.c (+48, -0) (Diff)
/source/blender/editors/sculpt_paint/paint_cursor.c (+3, -3) (Diff)
/source/blender/editors/sculpt_paint/paint_image.c (+2, -3) (Diff)
/source/blender/editors/sculpt_paint/paint_intern.h (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_ops.c (+4, -4) (Diff)
/source/blender/editors/sculpt_paint/paint_stroke.c (+7, -6) (Diff)
/source/blender/editors/sculpt_paint/paint_utils.c (+4, -4) (Diff)
/source/blender/editors/space_buttons/buttons_texture.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_edit.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/paint.c (+48, -0) (Diff)
/source/blender/editors/sculpt_paint/paint_cursor.c (+3, -3) (Diff)
/source/blender/editors/sculpt_paint/paint_image.c (+2, -3) (Diff)
/source/blender/editors/sculpt_paint/paint_intern.h (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_ops.c (+4, -4) (Diff)
/source/blender/editors/sculpt_paint/paint_stroke.c (+7, -6) (Diff)
/source/blender/editors/sculpt_paint/paint_utils.c (+4, -4) (Diff)
/source/blender/editors/space_buttons/buttons_texture.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_edit.c (+1, -1) (Diff)