History

Use blue default texture when we fail to load a normal map.

Andrzej Kapolka committed 13 years ago

Commit 55de8ce1 parent 070e7554 files · +14 −14Browse files

Showing the changes to interface/src/renderer/GeometryCache.cpp (1 of 4 files). Show all

Unified · Split

interface/src/renderer/GeometryCache.cpp+2−2
@@ -365,11 +365,11 @@ void NetworkGeometry::maybeReadModelWithMapping() { · 364 unmodified lines
365365 basePath = basePath.left(basePath.lastIndexOf('/') + 1);
366366 if (!part.diffuseFilename.isEmpty()) {
367367 url.setPath(basePath + part.diffuseFilename);
368− networkPart.diffuseTexture = Application::getInstance()->getTextureCache()->getTexture(url, mesh.isEye);
368+ networkPart.diffuseTexture = Application::getInstance()->getTextureCache()->getTexture(url, false, mesh.isEye);
369369 }
370370 if (!part.normalFilename.isEmpty()) {
371371 url.setPath(basePath + part.normalFilename);
372− networkPart.normalTexture = Application::getInstance()->getTextureCache()->getTexture(url);
372+ networkPart.normalTexture = Application::getInstance()->getTextureCache()->getTexture(url, true);
373373 }
374374 networkMesh.parts.append(networkPart);
375375

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t