Merge branch 'master' of https://github.com/OverloadedOrama/Pixelorama

Scripts/BrushButton.gd

@@ -18,4 +18,4 @@ func _on_BrushButton_pressed() -> void:
 		add_child(Global.right_brush_indicator)
 		if custom_brush_index > -1:
 			Global.custom_right_brush_index = custom_brush_index
-			Global.update_right_custom_brush()
+			Global.update_right_custom_brush()

Scripts/CameraMovement.gd

@@ -15,7 +15,7 @@ func _input(event) -> void:
 		drag = true
 	elif event.is_action_released("camera_drag"):
 		drag = false
-		
+
 	if Global.can_draw && Global.has_focus && Rect2(Vector2.ZERO, viewport_size).has_point(mouse_pos):
 		if event.is_action_pressed("zoom_in"): # Wheel Up Event
 			zoom_camera(-1)
@@ -30,8 +30,8 @@ func zoom_camera(dir : int) -> void:
 	#if zoom + zoom_margin > zoom_min && zoom + zoom_margin < zoom_max:
 	if zoom + zoom_margin > zoom_min:
 		zoom += zoom_margin
-	
+
 	if zoom > zoom_max:
 		zoom = zoom_max
 	if name == "Camera2D":
-		Global.zoom_level_label.text = "Zoom: x%s" % [stepify(1 / zoom.x, 0.01)]
+		Global.zoom_level_label.text = "Zoom: x%s" % [stepify(1 / zoom.x, 0.01)]

Scripts/FrameButton.gd

@@ -4,4 +4,4 @@ var frame := 0
 
 func _on_FrameButton_pressed() -> void:
 	Global.current_frame = frame
-	Global.change_frame()
+	Global.change_frame()

Scripts/Global.gd

@@ -251,4 +251,4 @@ func blend_image_with_color(image : Image, color : Color, interpolate_factor : f
 					blended_image.set_pixel(xx, yy, new_color)
 			else: #If color is transparent - if it's the eraser
 				blended_image.set_pixel(xx, yy, Color(0, 0, 0, 0))
-	return blended_image
+	return blended_image

Scripts/LayerContainer.gd

@@ -61,4 +61,4 @@ func _on_VisibilityButton_button_down() -> void:
 	visibility_toggled = true
 
 func _on_VisibilityButton_button_up() -> void:
-	visibility_toggled = false
+	visibility_toggled = false

Scripts/Main.gd

@@ -785,4 +785,4 @@ func _on_LeftVerticalMirroring_toggled(button_pressed) -> void:
 func _on_RightHorizontalMirroring_toggled(button_pressed) -> void:
 	Global.right_horizontal_mirror = button_pressed
 func _on_RightVerticalMirroring_toggled(button_pressed) -> void:
-	Global.right_vertical_mirror = button_pressed
+	Global.right_vertical_mirror = button_pressed