Merge branch 'feature/sprites' of https://github.com/tmickel/scratch-vm into feature/sprites

This commit is contained in:
Andrew Sliwinski 2016-08-08 16:50:21 -04:00
commit bda2926be2
2 changed files with 2 additions and 1 deletions

View file

@ -15,6 +15,7 @@ Scratch3OperatorsBlocks.prototype.getPrimitives = function() {
'math_number': this.number,
'math_positive_number': this.number,
'math_whole_number': this.number,
'math_angle': this.number,
'text': this.text,
'operator_add': this.add,
'operator_subtract': this.subtract,

View file

@ -129,7 +129,7 @@ Clone.prototype.setSize = function (size) {
// Keep size between 5% and 535%.
this.size = MathUtil.clamp(size, 5, 535);
self.renderer.updateDrawableProperties(this.drawableID, {
scale: this.size
scale: [this.size, this.size]
});
};