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 'timeadjustments' into NewHorizonsMerge

Browse Source 
Conflicts:
	CMakeLists.txt
	include/openspace/rendering/model/modelgeometry.h
	include/openspace/rendering/model/wavefrontgeometry.h
	include/openspace/rendering/planets/renderableplanetprojection.h
	include/openspace/util/imagesequencer.h
	scripts/default_startup.lua
	src/abuffer/abuffer.cpp
	src/rendering/model/renderablemodel.cpp
	src/rendering/model/wavefrontgeometry.cpp
	src/rendering/planets/renderableplanet.cpp
	src/rendering/planets/renderableplanetprojection.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderabletrail.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/spiceephemeris.cpp
	src/util/imagesequencer.cpp
This commit is contained in:
Anton Arbring
2015-04-23 22:51:55 -04:00
parent 9226dd2d6b 59ab268489
commit d3bf8eb7f7
66 changed files with 3704 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rendering/renderable.cpp
+2 -1
View File
@@ -75,7 +75,8 @@ Renderable::Renderable(const ghoul::Dictionary& dictionary)
_hasTimeInterval(false),
_startTime(""),
_endTime(""),
_targetBody("")
_targetBody(""),
_hasBody(false)
{
setName("renderable");
#ifndef NDEBUG