mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-06 12:28:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/kameleonvolume

Browse Source 
Conflicts:
	src/engine/openspaceengine.cpp
This commit is contained in:
Emil Axelsson
2017-03-03 18:08:29 +01:00
parent b32c416615 9d30d3323b
commit d7cd3a01a5
70 changed files with 1038 additions and 1595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/base/rendering/modelgeometry.cpp
View File

@@ -88,7 +88,8 @@ std::unique_ptr<ModelGeometry> ModelGeometry::createFromDictionary(
}
ModelGeometry::ModelGeometry(const ghoul::Dictionary& dictionary)
: _parent(nullptr)
: properties::PropertyOwner("ModelGeometry")
, _parent(nullptr)
, _mode(GL_TRIANGLES)
{
documentation::testSpecificationAndThrow(
@@ -97,8 +98,6 @@ ModelGeometry::ModelGeometry(const ghoul::Dictionary& dictionary)
"ModelGeometry"
);
setName("ModelGeometry");
std::string name;
bool success = dictionary.getValue(keyName, name);
ghoul_assert(success, "Name tag was not present");