From 333feea6e9450379f5314f327cf1ac1aef6d8a07 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Mon, 31 Aug 2015 21:37:38 +0300 Subject: Fix T45258, impossible to select brush when removing it from 2d painting. Also system added a brush every time it found no paint brush in the system which is not what we would want. Solution: * Brush panel stays visible always, regardless of whether there is a brush or not. * We search for first available brush when we find no brush in paint struct instead of always generating a new one. * Generating and searching for a brush take a mode argument now. Needed some refactoring to users of BKE_paint_init as well. * Did some style cleanups for paint mode enums. Patch is big but it's mostly argument refactoring. --- source/blender/editors/include/ED_image.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/include/ED_image.h') diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h index f49d4b508c6..4c4cec2ee29 100644 --- a/source/blender/editors/include/ED_image.h +++ b/source/blender/editors/include/ED_image.h @@ -59,8 +59,8 @@ void ED_space_image_get_uv_aspect(struct SpaceImage *sima, float *aspx, float *a void ED_space_image_scopes_update(const struct bContext *C, struct SpaceImage *sima, struct ImBuf *ibuf, bool use_view_settings); -void ED_space_image_paint_update(struct wmWindowManager *wm, struct ToolSettings *settings); -void ED_space_image_uv_sculpt_update(struct wmWindowManager *wm, struct ToolSettings *settings); +void ED_space_image_paint_update(struct wmWindowManager *wm, struct Scene *scene); +void ED_space_image_uv_sculpt_update(struct wmWindowManager *wm, struct Scene *scene); void ED_image_get_uv_aspect(struct Image *ima, struct ImageUser *iuser, float *aspx, float *aspy); void ED_image_mouse_pos(struct SpaceImage *sima, struct ARegion *ar, const int mval[2], float co[2]); -- cgit v1.2.3