mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 12:39:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Resolved merge conflicts

Browse Source
This commit is contained in:
Erik Broberg
2016-04-18 20:36:01 -04:00
parent 4073f4e6cb 63f8405c0a
commit 4f873e3f97
9 changed files with 232 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/rendering/patchrenderer.h
+1 -1
View File
@@ -66,7 +66,7 @@ namespace openspace {
unique_ptr<ProgramObject> _programObject;
shared_ptr<Geometry> _geometry;
TextureTileSet tileSet;
TextureTileSet _tileSet;
};