fixed merge

This commit is contained in:
Sam Keddy
2020-04-15 00:10:21 +00:00
45 changed files with 5409 additions and 4199 deletions

View File

@@ -1,4 +1,3 @@
function changeZoom (layer, direction, cursorLocation) {
var oldWidth = canvasSize[0] * zoom;
var oldHeight = canvasSize[1] * zoom;
@@ -29,4 +28,4 @@ function changeZoom (layer, direction, cursorLocation) {
// adjust brush size
currentTool.updateCursor();
}
}