mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

Arrow icons update

Browse Source
This commit is contained in:
jdescottes
2013-09-26 07:47:11 +02:00
parent 9395be3034
commit 3a8d96f840
5 changed files with 77 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
js/utils/FrameUtils.js
View File

@@ -3,10 +3,13 @@
ns.FrameUtils = {
merge : function (frames) {
var merged = frames[0].clone();
var w = merged.getWidth(), h = merged.getHeight();
for (var i = 1 ; i < frames.length ; i++) {
pskl.utils.FrameUtils.mergeFrames_(merged, frames[i]);
var merged = null;
if (frames.length) {
merged = frames[0].clone();
var w = merged.getWidth(), h = merged.getHeight();
for (var i = 1 ; i < frames.length ; i++) {
pskl.utils.FrameUtils.mergeFrames_(merged, frames[i]);
}
}
return merged;
},