From 070ce416b9b4714d1805eb920384d447648ed71e Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Thu, 18 Sep 2014 13:03:02 +0200 Subject: One last tweak to palette deletion code. It would correct active color only when deleting the last color. --- source/blender/blenkernel/intern/paint.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/blenkernel/intern/paint.c') diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 6a3062f10ae..df2f0c84f00 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -316,7 +316,8 @@ void BKE_paint_curve_set(Brush *br, PaintCurve *pc) void BKE_palette_color_remove(Palette *palette, PaletteColor *color) { if (color) { - if ((color == palette->colors.last) && (palette->colors.last != palette->colors.first)) + int numcolors = BLI_countlist(&palette->colors); + if ((numcolors == palette->active_color + 1) && (numcolors != 1)) palette->active_color--; BLI_remlink(&palette->colors, color); -- cgit v1.2.3