mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-09 06:48:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Erik Broberg
2016-08-12 17:05:44 -04:00
parent 7fc31151ea b0d8dd59f4
commit 656426dbe5
15 changed files with 187 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/base/rendering/renderablemodel.h
View File

@@ -67,10 +67,10 @@ private:
glm::dmat3 _modelTransform;
float _alpha;
glm::dmat3 _stateMatrix;
//glm::dmat3 _stateMatrix;
std::string _source;
std::string _destination;
//std::string _source;
//std::string _destination;
std::string _target;
//bool _isGhost;