kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

One last tweak to palette deletion code. It would correct active color

Browse Source 
only when deleting the last color.
This commit is contained in:
Antony Riakiotakis 2014-09-18 13:03:02 +02:00
parent 90c1afb020
commit 070ce416b9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/paint.c
View File

@ -316,7 +316,8 @@ void BKE_paint_curve_set(Brush *br, PaintCurve *pc)
void BKE_palette_color_remove(Palette *palette, PaletteColor *color) void BKE_palette_color_remove(Palette *palette, PaletteColor *color)
{ {
if (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--; palette->active_color--;
BLI_remlink(&palette->colors, color); BLI_remlink(&palette->colors, color);