notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sdl2.0

Browse source
This commit is contained in:
Bill Kendrick 2022-06-14 01:20:23 -07:00
commit 934f500584
134 changed files with 37851 additions and 8977 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/tuxpaint.c
View file

@ -23670,6 +23670,14 @@ static int do_color_mix(void)
for (i = 0; i < NUM_MIXER_COLORS; i++)
color_mixer_color_counts[i] = 0;
}
else
{
new_r = color_hexes[COLOR_MIXER][0];
new_g = color_hexes[COLOR_MIXER][1];
new_b = color_hexes[COLOR_MIXER][2];
}
done = 0;
chose = 0;