mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 20:50:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage

Browse Source 
Conflicts:
	modules/base/rendering/screenspaceimage.cpp
This commit is contained in:
Sebastian Piwell
2016-03-10 15:06:34 -05:00
parent a53e289a20 49eece4d43
commit d27560957d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/base/rendering/screenspaceimage.cpp
+2 -2
View File
@@ -107,8 +107,8 @@ bool ScreenSpaceImage::isReady() const{
}
void ScreenSpaceImage::loadTexture() {
if (_texturePath.value() != "") {
std::unique_ptr<ghoul::opengl::Texture> texture = ghoul::io::TextureReader::ref().loadTexture(absPath(_texturePath.value()));
if (_texturePath != "") {
std::unique_ptr<ghoul::opengl::Texture> texture = ghoul::io::TextureReader::ref().loadTexture(absPath(_texturePath));
if (texture) {
// LDEBUG("Loaded texture from '" << absPath(_texturePath) << "'");
// std::cout<< std::endl << std::endl << "Loaded texture from '" << absPath(_texturePath) << "'" <<std::endl << std::endl;