Skip to content

Commit fe2d8f6

Browse files
committed
Merge branch 'development'
2 parents 875620b + 50c9710 commit fe2d8f6

File tree

6 files changed

+15
-14
lines changed

6 files changed

+15
-14
lines changed

build/jsmodeler.ext.svgtomodel.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/jsmodeler.ext.textgenerator.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/jsmodeler.ext.three.js

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/jsmodeler.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core/jsm.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var JSM = function ()
22
{
33
this.mainVersion = 0;
4-
this.subVersion = 44;
4+
this.subVersion = 45;
55
};
66

77
/**

src/extensions/threeviewer/threeconverter.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,8 @@ JSM.ConvertJSONDataToThreeMeshes = function (jsonData, textureLoadedCallback, as
265265
}
266266

267267
var mesh = new THREE.Mesh (geometry, material);
268-
mesh.originalJsonIndex = meshIndex;
268+
mesh.originalJsonMaterialIndex = materialIndex;
269+
mesh.originalJsonMeshIndex = meshIndex;
269270
resultMeshes.push (mesh);
270271
}
271272

0 commit comments

Comments
 (0)