History

replaced Application::resourcesPath() with PathUtils::resourcesPath()

ZappoMan committed 11 years ago

Commit bfcc78c1 parent 753dc0729 files · +194 −124Browse files

Showing the changes to interface/src/Environment.cpp (1 of 29 files). Show all

Unified · Split

interface/src/Environment.cpp+2−1
@@ -17,6 +17,7 @@ · 16 unmodified lines
1717
1818 #include <GeometryUtil.h>
1919 #include <PacketHeaders.h>
20+#include <PathUtils.h>
2021 #include <ProgramObject.h>
2122 #include <SharedUtil.h>
2223
@@ -188,7 +189,7 @@ int Environment::parseData(const HifiSockAddr& senderAddress, const QByteArray& · 165 unmodified lines
188189
189190 ProgramObject* Environment::createSkyProgram(const char* from, int* locations) {
190191 ProgramObject* program = new ProgramObject();
191− QByteArray prefix = QString(Application::resourcesPath() + "/shaders/SkyFrom" + from).toUtf8();
192+ QByteArray prefix = QString(PathUtils::resourcesPath() + "/shaders/SkyFrom" + from).toUtf8();
192193 program->addShaderFromSourceFile(QGLShader::Vertex, prefix + ".vert");
193194 program->addShaderFromSourceFile(QGLShader::Fragment, prefix + ".frag");
194195 program->link();

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