mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-13 15:31:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Solve merge conflicts.

Browse Source
This commit is contained in:
Kalle Bladin
2016-06-07 12:54:52 -04:00
parent 05e0e8254b 146b71e129
commit 012bcaefaf
234 changed files with 262157 additions and 2398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/rendering/renderable.cpp
View File

@@ -53,6 +53,7 @@ Renderable* Renderable::createFromDictionary(const ghoul::Dictionary& dictionary
std::string renderableType;
success = dictionary.getValue(KeyType, renderableType);
if (!success) {
LERROR("Renderable '" << name << "' did not have key '" << KeyType << "'");
return nullptr;
@@ -132,6 +133,10 @@ void Renderable::render(const RenderData& data)
{
}
void Renderable::postRender(const RenderData& data)
{
}
void Renderable::setPscUniforms(
ghoul::opengl::ProgramObject& program,
const Camera& camera,