Version bump

- fixes for 3d model loading and exporting

Author: Aedif

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.7.10
+
+- Fixed modifications via `MassEdit.spawnPreset` hook being overridden for virtual 3D model presets
+- Fixed 3D Virtual model export to compendium producing invalid presets
+
 # 2.7.9
 
 - 3D model `Auto Center` is now enabled by default when spawning presets

multi-token-edit/module.json

@@ -2,8 +2,8 @@
   "id": "multi-token-edit",
   "title": "Baileywiki Mass Edit",
   "description": "Search and edit multiple placeables at the same time.",
-  "version": "2.7.9",
-  "download": "https://github.com/Aedif/multi-token-edit/releases/download/2.7.9/multi-token-edit.zip",
+  "version": "2.7.10",
+  "download": "https://github.com/Aedif/multi-token-edit/releases/download/2.7.10/multi-token-edit.zip",
   "url": "https://github.com/Aedif/multi-token-edit",
   "manifest": "https://github.com/Aedif/multi-token-edit/releases/latest/download/module.json",
   "authors": [

multi-token-edit/scripts/presets/containerAppV2.js

@@ -14,19 +14,19 @@ import { PresetConfig } from './editApp.js';
 export async function registerPresetHandlebarPartials() {
   await foundry.applications.handlebars.getTemplate(
     `modules/${MODULE_ID}/templates/preset/container/partials/preset.hbs`,
-    'me-preset'
+    'me-preset',
   );
   await foundry.applications.handlebars.getTemplate(
     `modules/${MODULE_ID}/templates/preset/container/partials/folder.hbs`,
-    'me-preset-folder'
+    'me-preset-folder',
   );
   await foundry.applications.handlebars.getTemplate(
     `modules/${MODULE_ID}/templates/preset/container/partials/presetsContent.hbs`,
-    'me-presets-content'
+    'me-presets-content',
   );
   await foundry.applications.handlebars.getTemplate(
     `modules/${MODULE_ID}/templates/preset/container/partials/presetsTopList.hbs`,
-    'me-preset-list'
+    'me-preset-list',
   );
 
   // Conditional rendering helper
@@ -55,7 +55,7 @@ export async function registerPresetHandlebarPartials() {
 }
 
 export class PresetContainerV2 extends foundry.applications.api.HandlebarsApplicationMixin(
-  foundry.applications.api.ApplicationV2
+  foundry.applications.api.ApplicationV2,
 ) {
   static _oldPositions = {};
 
@@ -722,6 +722,10 @@ export class PresetContainerV2 extends foundry.applications.api.HandlebarsApplic
       return p;
     });
 
+    for (const p of presets) {
+      if (p.virtual) await p.load({ force: true });
+    }
+
     await PresetStorage.createDocuments(presets, pack);
 
     if (selected.length) this.render(true);
@@ -870,7 +874,7 @@ export class PresetContainerV2 extends foundry.applications.api.HandlebarsApplic
           `<video width="${320 * ratio}" height="${240 * ratio}" autoplay loop><source src="${src}" type="video/${src
             .split('.')
             .pop()
-            .toLowerCase()}"></video>`
+            .toLowerCase()}"></video>`,
         );
       }
     }
@@ -912,7 +916,7 @@ export class PresetContainerV2 extends foundry.applications.api.HandlebarsApplic
           ),
           draggable: folder.pack === PresetStorage.workingPack,
           browser: true,
-        }
+        },
       );
       folderElement.replaceWith(content);
     }
@@ -941,7 +945,7 @@ export class PresetContainerV2 extends foundry.applications.api.HandlebarsApplic
         createEnabled,
         externalTrees,
         browser,
-      }
+      },
     );
     $(this.form).find('.item-list').html(content);
   }
@@ -953,7 +957,7 @@ export class PresetContainerV2 extends foundry.applications.api.HandlebarsApplic
         label: item.attributes.name,
         type: 'uuid',
         id: item.dataset.uuid,
-      })
+      }),
     );
   }
 

multi-token-edit/scripts/presets/preset.js

@@ -383,20 +383,26 @@ export class VirtualFilePreset extends Preset {
     const modelBB = new game.Levels3DPreview.THREE.Box3().setFromObject(object3d.model);
     const depth = (modelBB.max.y - modelBB.min.y) * canvas.grid.size ?? 0.05;
 
-    data.flags = {
-      'levels-3d-preview': {
-        model3d: src,
-        autoGround: true,
-        autoCenter: true,
-        cameraCollision: false,
-        castShadow: true,
-        collision: true,
-        color: '#ffffff',
-        dynaMesh: 'default',
-        sight: true,
-        depth,
+    foundry.utils.mergeObject(
+      data,
+      {
+        flags: {
+          'levels-3d-preview': {
+            model3d: src,
+            autoGround: true,
+            autoCenter: true,
+            cameraCollision: false,
+            castShadow: true,
+            collision: true,
+            color: '#ffffff',
+            dynaMesh: 'default',
+            sight: true,
+            depth,
+          },
+        },
       },
-    };
+      { overwrite: false },
+    );
 
     data.width = canvas.grid.size * (modelBB.max.x - modelBB.min.x);
     data.height = canvas.grid.size * (modelBB.max.z - modelBB.min.z);