mirror of
https://github.com/photonstorm/phaser
synced 2025-02-17 14:38:30 +00:00
Merge pull request #2526 from drhayes/dev
Don't extend Phaser.Utils when doing deep copy in Phaser.Cache.getJSON.
This commit is contained in:
commit
d81ec7fa0f
1 changed files with 3 additions and 3 deletions
|
@ -454,10 +454,10 @@ Phaser.Cache.prototype = {
|
|||
font: null,
|
||||
base: new PIXI.BaseTexture(data)
|
||||
};
|
||||
|
||||
|
||||
if (xSpacing === undefined) { xSpacing = 0; }
|
||||
if (ySpacing === undefined) { ySpacing = 0; }
|
||||
|
||||
|
||||
if (atlasType === 'json')
|
||||
{
|
||||
obj.font = Phaser.LoaderParser.jsonBitmapFont(atlasData, obj.base, xSpacing, ySpacing);
|
||||
|
@ -1312,7 +1312,7 @@ Phaser.Cache.prototype = {
|
|||
{
|
||||
if (clone)
|
||||
{
|
||||
return Phaser.Utils.extend(true, data);
|
||||
return Phaser.Utils.extend(true, {}, data);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
Loading…
Add table
Reference in a new issue