mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-26 05:58:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz

Browse Source 
Conflicts:
	src/rendering/planets/renderableplanet.cpp
	src/rendering/planets/renderableplanetprojection.cpp
	src/rendering/renderablefov.cpp
This commit is contained in:
Joakim Kilby
2015-02-19 10:07:38 +01:00
parent 24d8f8c41e 88c976e16e
commit f14f288f19
11 changed files with 195 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rendering/renderablefov.cpp
+1
View File
@@ -122,6 +122,7 @@ RenderableFov::~RenderableFov(){
bool RenderableFov::initialize(){
bool completeSuccess = true;
if (_programObject == nullptr)
completeSuccess &= OsEng.ref().configurationManager()->getValue("FovProgram", _programObject);
completeSuccess &= OsEng.ref().configurationManager()->getValue("EphemerisProgram", _programObject);
allocateData();