Merge branch 'master' of https://github.com/Orama-Interactive/Pixelorama into xdg-standard

Getting ourselves up to date with upstream for easy merge! nya ^.^
This commit is contained in:
sapient_cogbag 2020-04-11 23:38:53 +01:00
commit 516723d125
No known key found for this signature in database
GPG key ID: 9DA0A435732D7C4A
6 changed files with 93 additions and 26 deletions

View file

@ -148,6 +148,8 @@ func _ready() -> void:
for t in tools:
t[0].connect("pressed", self, "_on_Tool_pressed", [t[0]])
Global.update_hint_tooltips()
# Checks to see if it's 3.1.x
if Engine.get_version_info().major == 3 and Engine.get_version_info().minor < 2:
Global.left_color_picker.get_picker().move_child(Global.left_color_picker.get_picker().get_child(0), 1)