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/blenkernel/BKE_brush.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/blenkernel/BKE_brush.h') diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h index 042fba7294c..aff3fb08df6 100644 --- a/source/blender/blenkernel/BKE_brush.h +++ b/source/blender/blenkernel/BKE_brush.h @@ -40,7 +40,8 @@ void BKE_brush_system_init(void); void BKE_brush_system_exit(void); /* datablock functions */ -struct Brush *BKE_brush_add(struct Main *bmain, const char *name); +struct Brush *BKE_brush_add(struct Main *bmain, const char *name, short ob_mode); +struct Brush *BKE_brush_first_search(struct Main *bmain, short ob_mode); struct Brush *BKE_brush_copy(struct Brush *brush); void BKE_brush_make_local(struct Brush *brush); void BKE_brush_free(struct Brush *brush); -- cgit v1.2.3