From 5fe4b74a39521fbdc575cfe5352ee33e45d4c4f7 Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Mon, 10 Feb 2020 02:39:36 +0200 Subject: [PATCH] New alpha blend behavior now works on circle brushes --- Scripts/Canvas.gd | 3 ++- Scripts/Palette/PaletteContainer.gd | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Scripts/Canvas.gd b/Scripts/Canvas.gd index ad6f6a251..ceaa3fc5b 100644 --- a/Scripts/Canvas.gd +++ b/Scripts/Canvas.gd @@ -869,10 +869,11 @@ func plot_circle(sprite : Image, xm : int, ym : int, r : int, color : Color, fil draw_pixel_blended(sprite, draw_pos, color) func draw_pixel_blended(sprite : Image, pos : Vector2, color : Color) -> void: - if point_in_rectangle(pos, Vector2(west_limit - 1, north_limit - 1), Vector2(east_limit, south_limit)): + if point_in_rectangle(pos, Vector2(west_limit - 1, north_limit - 1), Vector2(east_limit, south_limit)) && !(pos in mouse_press_pixels): if color.a > 0 && color.a < 1: # Blend alpha color.a = color.a + sprite.get_pixelv(pos).a * (1 - color.a) + mouse_press_pixels.append(pos) sprite.set_pixelv(pos, color) # Checks if a point is inside a rectangle diff --git a/Scripts/Palette/PaletteContainer.gd b/Scripts/Palette/PaletteContainer.gd index 533adec2e..c543049af 100644 --- a/Scripts/Palette/PaletteContainer.gd +++ b/Scripts/Palette/PaletteContainer.gd @@ -191,4 +191,3 @@ func get_palette_files(path : String) -> Array: func save_palette(palette_name : String, filename : String) -> void: var palette = Global.palettes[palette_name] palette.save_to_file(palettes_path.plus_file(filename)) -