From 60422c01330b7dce4ebd6e1790b6243091dfcf21 Mon Sep 17 00:00:00 2001
From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
Date: Fri, 10 Jan 2020 19:11:10 +0200
Subject: [PATCH] Fixed bug where, if you had a random brush selected and then
 selected the pencil tool, "brush color from" did not appear

Also added our first patron, Mike King, to the donors name, in the "About" dialog. Thank you Mike!
---
 Changelog.md                   | 1 +
 Scripts/Dialogs/AboutDialog.gd | 1 +
 Scripts/Main.gd                | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ec05e59e6..24c39bd84 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed crash that occured when trying to delete contents of a selection, that were outside the canvas.
 - Fixed .gpl palettes not being imported correctly - Issue #112
 - Fixed crash that occured when pressing the play buttons on the timeline, on Godot 3.2 - Issue #111
+- Fixed bug where, if you had a random brush selected and then selected the pencil tool, "brush color from" did not appear.
 
 ## [v0.6] - 06-01-2020
 
diff --git a/Scripts/Dialogs/AboutDialog.gd b/Scripts/Dialogs/AboutDialog.gd
index 1f98c97c8..b57fe1cc0 100644
--- a/Scripts/Dialogs/AboutDialog.gd
+++ b/Scripts/Dialogs/AboutDialog.gd
@@ -28,6 +28,7 @@ func _ready() -> void:
 
 	var donors_root := donors.create_item()
 	donors.create_item(donors_root).set_text(0, "  pcmxms")
+	donors.create_item(donors_root).set_text(0, "  Mike King")
 
 func _on_AboutDialog_about_to_show() -> void:
 	var current_version : String = ProjectSettings.get_setting("application/config/Version")
diff --git a/Scripts/Main.gd b/Scripts/Main.gd
index 19e06d29b..855707382 100644
--- a/Scripts/Main.gd
+++ b/Scripts/Main.gd
@@ -559,7 +559,7 @@ func _on_Tool_pressed(tool_pressed : BaseButton, mouse_press := true, key_for_le
 			Global.left_brush_type_container.visible = true
 			Global.left_brush_size_container.visible = true
 			Global.left_mirror_container.visible = true
-			if Global.current_left_brush_type == Global.BRUSH_TYPES.FILE || Global.current_left_brush_type == Global.BRUSH_TYPES.CUSTOM:
+			if Global.current_left_brush_type == Global.BRUSH_TYPES.FILE || Global.current_left_brush_type == Global.BRUSH_TYPES.CUSTOM || Global.current_left_brush_type == Global.BRUSH_TYPES.RANDOM_FILE:
 				Global.left_color_interpolation_container.visible = true
 		elif current_action == "Eraser":
 			Global.left_brush_type_container.visible = true
@@ -584,7 +584,7 @@ func _on_Tool_pressed(tool_pressed : BaseButton, mouse_press := true, key_for_le
 			Global.right_brush_type_container.visible = true
 			Global.right_brush_size_container.visible = true
 			Global.right_mirror_container.visible = true
-			if Global.current_right_brush_type == Global.BRUSH_TYPES.FILE || Global.current_right_brush_type == Global.BRUSH_TYPES.CUSTOM:
+			if Global.current_right_brush_type == Global.BRUSH_TYPES.FILE || Global.current_right_brush_type == Global.BRUSH_TYPES.CUSTOM || Global.current_right_brush_type == Global.BRUSH_TYPES.RANDOM_FILE:
 				Global.right_color_interpolation_container.visible = true
 		elif current_action == "Eraser":
 			Global.right_brush_type_container.visible = true