Skip to content

Commit

Permalink
fixed #3409 - do not remove custom blocks referenced in customized pr…
Browse files Browse the repository at this point in the history
…imitives as "unused"
  • Loading branch information
jmoenig committed Oct 18, 2024
1 parent a0448ad commit 90d6959
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
3 changes: 3 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## in development:

### 2024-09-18
* objects: fixed #3409 - do not remove custom blocks referenced in customized primitives as "unused"

## 10.1.5:
* **Notable Fixes:**
* fixed broadcasting and sending messages with data
Expand Down
2 changes: 1 addition & 1 deletion snap.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<script src="src/widgets.js?version=2024-07-24"></script>
<script src="src/blocks.js?version=2024-10-11"></script>
<script src="src/threads.js?version=2024-10-15"></script>
<script src="src/objects.js?version=2024-10-13"></script>
<script src="src/objects.js?version=2024-10-18"></script>
<script src="src/scenes.js?version=2024-05-28"></script>
<script src="src/gui.js?version=2024-10-15"></script>
<script src="src/paint.js?version=2023-05-24"></script>
Expand Down
6 changes: 4 additions & 2 deletions src/objects.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ CustomBlockDefinition, exportEmbroidery*/

/*jshint esversion: 11*/

modules.objects = '2024-October-13';
modules.objects = '2024-October-18';

var SpriteMorph;
var StageMorph;
Expand Down Expand Up @@ -8386,7 +8386,9 @@ SpriteMorph.prototype.usesBlockInstance = function (

if (definition.isGlobal && !skipGlobals) {
inDefinitions = [];
this.parentThatIsA(StageMorph).globalBlocks.forEach(def => {
this.parentThatIsA(StageMorph).globalBlocks.concat(
this.customizedPrimitives()
).forEach(def => {
if (forRemoval && (definition === def)) {return; }
if (skipBlocks && contains(skipBlocks, def)) {return; }
if (def.body) {
Expand Down

0 comments on commit 90d6959

Please sign in to comment.