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

Merge remote-tracking branch 'origin/kameleon' into properties

Browse Source
This commit is contained in:
Alexander Bock
2014-05-02 16:59:50 +02:00
parent 993ebe0692 a4a528375b
commit 6c15bebfff
28 changed files with 806 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/rendering/renderablevolumecl.h
+4
View File
@@ -43,6 +43,10 @@
#define SGCT_WINDOWS_INCLUDE
#include <sgct.h>
namespace sgct_utils {
class SGCTBox;
}
//#include <vector>
//#include <string>
#ifdef __APPLE__