mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-23 05:19:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/globebrowsing

Browse Source 
# Conflicts:
#	modules/globebrowsing/chunk/chunkrenderer.cpp
#	modules/globebrowsing/globes/renderableglobe.cpp
#	modules/globebrowsing/globes/renderableglobe.h
This commit is contained in:
Alexander Bock
2016-12-03 01:32:23 +01:00
parent 777e6c628f c515bbfd0f
commit 341bc8b105
228 changed files with 11574 additions and 1965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/debugging/rendering/renderabledebugplane.h
View File

@@ -28,7 +28,7 @@
#include <openspace/rendering/renderable.h>
#include <openspace/properties/stringproperty.h>
#include <openspace/properties/vectorproperty.h>
#include <openspace/properties/vector/vec2property.h>
#include <openspace/util/updatestructures.h>
namespace ghoul {