Skip to content

Commit

Permalink
Fixes issue where we had a Resource as a URL for a material image
Browse files Browse the repository at this point in the history
  • Loading branch information
Tom Fili committed Feb 13, 2018
1 parent 0ebeb19 commit 34c4ff9
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions Source/Scene/Material.js
Original file line number Diff line number Diff line change
Expand Up @@ -791,10 +791,8 @@ define([
}

if (uniformValue !== material._texturePaths[uniformId]) {
if (typeof uniformValue === 'string') {
var resource = new Resource({
url: uniformValue
});
if (typeof uniformValue === 'string' || uniformValue instanceof Resource) {
var resource = Resource.createIfNeeded(uniformValue);
var promise;
if (ktxRegex.test(uniformValue)) {
promise = loadKTX(resource);
Expand Down

0 comments on commit 34c4ff9

Please sign in to comment.