Merging layer & saving sprite now uses custom blend_rect method

Also added CameraMovement.gd to the preview window camera and fixed a cursor problem where it always remained as the default arrow cursor outside the canvas
This commit is contained in:
OverloadedOrama 2019-12-07 01:08:23 +02:00
parent 5613c3d7ef
commit 2369243cfc
6 changed files with 25 additions and 16 deletions

View file

@ -1,6 +1,6 @@
[gd_scene load_steps=48 format=2]
[ext_resource path="res://Main Theme.tres" type="Theme" id=1]
[ext_resource path="res://Themes & Styles/Main Theme.tres" type="Theme" id=1]
[ext_resource path="res://Scripts/Main.gd" type="Script" id=2]
[ext_resource path="res://Assets/Graphics/Tools/RectSelect.png" type="Texture" id=3]
[ext_resource path="res://Assets/Graphics/Tools/ColorPicker.png" type="Texture" id=4]
@ -11,7 +11,7 @@
[ext_resource path="res://Assets/Graphics/Color switch.png" type="Texture" id=9]
[ext_resource path="res://Assets/Graphics/Color defaults.png" type="Texture" id=10]
[ext_resource path="res://Assets/Graphics/Brush_button.png" type="Texture" id=11]
[ext_resource path="res://Styles/RulerStyle.tres" type="StyleBox" id=12]
[ext_resource path="res://Themes & Styles/RulerStyle.tres" type="StyleBox" id=12]
[ext_resource path="res://Scripts/HorizontalRuler.gd" type="Script" id=13]
[ext_resource path="res://Scripts/VerticalRuler.gd" type="Script" id=14]
[ext_resource path="res://Prefabs/Canvas.tscn" type="PackedScene" id=15]
@ -1114,6 +1114,7 @@ script = ExtResource( 18 )
offset = Vector2( 32, 32 )
current = true
zoom = Vector2( 0.15, 0.15 )
script = ExtResource( 16 )
[node name="LayerLabel" type="Label" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc"]
margin_top = 167.0