mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-02 08:49:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

solve merge conflict

Browse Source
This commit is contained in:
Michael Nilsson
2016-06-01 14:03:39 -04:00
parent f029362372 876c86ca75
commit cb601042a6
25 changed files with 899 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/iswa/rendering/texturecygnet.cpp
-1
View File
@@ -36,7 +36,6 @@ TextureCygnet::TextureCygnet(const ghoul::Dictionary& dictionary)
:IswaCygnet(dictionary)
{
registerProperties();
_type = IswaManager::CygnetType::Texture;
}
TextureCygnet::~TextureCygnet(){}