Skip to content

Commit

Permalink
Merge pull request #8 from Feu-Secret/tokenmagic-dev
Browse files Browse the repository at this point in the history
Fixed an issue with target-enhancements module.
  • Loading branch information
Feu-Secret authored Jul 15, 2020
2 parents e49d12e + 65035a8 commit 35feeba
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 1 deletion.
Binary file modified .vs/Tokenmagic/v16/.suo
Binary file not shown.
2 changes: 1 addition & 1 deletion .vs/VSWorkspaceState.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"\\tokenmagic\\module",
"\\tokenmagic\\updates"
],
"SelectedNode": "\\tokenmagic\\fx\\glsl\\fragmentshaders\\mirrorimages.js",
"SelectedNode": "\\README.md",
"PreviewInSolutionExplorer": false
}
Binary file modified .vs/slnx.sqlite
Binary file not shown.
4 changes: 4 additions & 0 deletions tokenmagic/module/tokenmagic.js
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,10 @@ Hooks.on("canvasReady", (canvas) => {

Hooks.on("updateScene", (scene, data, options) => {
log("Hook -> updateScene");

// to resolve an incompatibility with target-enhancements module
if (data.hasOwnProperty("flags") && data.flags.hasOwnProperty("target-enhancements")) { return; }

Anime.resetAnimation();
});

Expand Down

0 comments on commit 35feeba

Please sign in to comment.