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

solve merge conflict

Browse Source
This commit is contained in:
Michael Nilsson
2016-05-04 12:10:49 -04:00
parent 05cc0850b7 8fc89d8762
commit 3a80405c30
17 changed files with 264 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/properties/selectionproperty.h
+1
View File
@@ -42,6 +42,7 @@ public:
SelectionProperty(std::string identifier, std::string guiName);
void addOption(Option option);
void removeOptions();
const std::vector<Option>& options() const;
private:
include/openspace/rendering/screenspacerenderable.h
+1 -1
View File
@@ -54,7 +54,7 @@ namespace openspace {
class ScreenSpaceRenderable : public properties::PropertyOwner {
public:
static ScreenSpaceRenderable* createFromDictionary(const ghoul::Dictionary& dictionary);
ScreenSpaceRenderable();
ScreenSpaceRenderable(const ghoul::Dictionary& dictionary);
~ScreenSpaceRenderable();
virtual void render() = 0;