scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 15:02:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'develop' of https://github.com/LLK/scratch-vm into feature/serialization

Browse source 
# Conflicts:
#	src/virtual-machine.js
This commit is contained in:
Ray Schamp 2017-04-27 17:53:30 -04:00
commit 4f59e98bc8
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/virtual-machine.js
View file

@ -240,6 +240,8 @@ class VirtualMachine extends EventEmitter {
return sb2.deserialize(json, this.runtime, true).then(targets => {
this.runtime.targets.push(targets[0]);
this.editingTarget = targets[0];
this.editingTarget.updateAllDrawableProperties();
// Update the VM user's knowledge of targets and blocks on the workspace.
this.emitTargetsUpdate();
this.emitWorkspaceUpdate();