Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
TS committed May 31, 2022
2 parents d067dd4 + b2b99d6 commit 5d6eb9d
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion dist/tgen.min.js

Large diffs are not rendered by default.

Binary file modified dist/tgen.min.js.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion src/tgen-base.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ require("./tgen-generator")(SeamlessTextureGenerator);
require("./effects/index")(SeamlessTextureGenerator);
require("./filters/index")(SeamlessTextureGenerator);
// require("./presets/index")(SeamlessTextureGenerator);
// require("./tgen-tests")(SeamlessTextureGenerator);
require("./tgen-tests")(SeamlessTextureGenerator);

if (typeof window !== "undefined") {
window.tgen = SeamlessTextureGenerator;
Expand Down
2 changes: 1 addition & 1 deletion test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const assert = require("assert");
const fs = require("fs");
const PNG = require("pngjs").PNG;
const { exit } = require("process");
const tgen = require("./../src/tgen-base.js");
const tgen = require("./../src/tgen-base-with-presets.js");

var size = 64; // image width and height for testing, DON'T TOUCH!

Expand Down

0 comments on commit 5d6eb9d

Please sign in to comment.