Merge branch 'origin/master'

This commit is contained in:
NathanSweet 2013-11-07 21:48:44 +01:00
commit 4327c2aa30

View File

@ -1451,7 +1451,7 @@ spine.Atlas = function (atlasText, textureLoader) {
else if (direction == "xy") else if (direction == "xy")
page.uWrap = page.vWrap = spine.Atlas.TextureWrap.repeat; page.uWrap = page.vWrap = spine.Atlas.TextureWrap.repeat;
textureLoader.load(page, line); textureLoader.load(page, line, this);
this.pages.push(page); this.pages.push(page);