Merge branch 'master' into line-tool

This commit is contained in:
Overloaded 2019-12-15 17:49:47 +02:00 committed by GitHub
commit f97818d134
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 429 additions and 226 deletions

View file

@ -61,7 +61,7 @@ func _process(delta : float) -> void:
Global.canvas.update_texture(Global.canvas.current_layer_index)
tex.create_from_image(img, 0)
update()
# Makes line2d invisible
if is_instance_valid(Global.canvas.line_2d): # Checks to see if line_2d object still exists
Global.canvas.line_2d.default_color = Color(0, 0, 0, 0)
@ -102,7 +102,7 @@ func _process(delta : float) -> void:
Global.selected_pixels.append(Vector2(xx, yy))
Global.canvas.handle_redo("Rectangle Select") #Redo
# Makes line2d visible
if is_instance_valid(Global.canvas.line_2d): # Checks to see if line_2d object still exists
Global.canvas.line_2d.default_color = Color.darkgray