djsundog
/
obj2gltf
mirror of https://github.com/CesiumGS/obj2gltf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing merge conflict #109

This commit is contained in:
Tim Knip 2017-09-29 20:21:02 +02:00
parent 3ec919e9c4 c18f8c49eb
commit 3cff129933
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/loadMtl.js
View File

@ -240,6 +240,7 @@ function loadMaterialTexture(material, name, texturePath, textureOptions, mtlDir
textureOptions = textureOptions || {}; textureOptions = textureOptions || {};
var newTexturePath = parseMapOptions(texturePath, textureOptions); var newTexturePath = parseMapOptions(texturePath, textureOptions);
// TODO: handle texture options // TODO: handle texture options
// NOTE: this might not be a good place to do this // NOTE: this might not be a good place to do this
texturePath = newTexturePath ? newTexturePath : texturePath; texturePath = newTexturePath ? newTexturePath : texturePath;