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

Merge branch 'develop' into solarsystem2

Browse Source 
Conflicts:
	.gitignore
	include/openspace/rendering/renderablefov.h
	src/CMakeLists.txt
	src/rendering/model/renderablemodel.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderablepath.cpp
	src/rendering/renderabletrail.cpp
	src/util/factorymanager.cpp
This commit is contained in:
Michal Marcinkowski
2014-12-15 13:23:30 -05:00
parent 66cb7b18e8 edf709cf1b
commit f032b4e3b0
63 changed files with 1045 additions and 1390 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/util/powerscaledsphere.h
-2
View File
@@ -30,7 +30,6 @@
#include <openspace/util/powerscaledcoordinate.h>
#include <openspace/util/powerscaledscalar.h>
namespace openspace {
class PowerScaledSphere {
@@ -56,7 +55,6 @@ private:
GLuint _vBufferID;
GLuint _iBufferID;
GLenum _mode;
unsigned int _isize;
unsigned int _vsize;
Vertex* _varray;