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

Beta-3 Release Candidate branch (#753)

Browse Source 
* Merge experimental session recording branch
 * Merge new CEF-based webgui branch
This commit is contained in:
Alexander Bock
2018-11-05 20:51:48 -05:00
committed by GitHub
parent 7181de4673
commit 267879878b
27 changed files with 101 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/openspace/scene/scenegraphnode.h
View File

@@ -27,14 +27,14 @@
#include <openspace/properties/propertyowner.h>
#include <openspace/properties/stringproperty.h>
#include <openspace/properties/scalar/boolproperty.h>
#include <ghoul/glm.h>
#include <ghoul/misc/boolean.h>
#include <atomic>
#include <functional>
#include <memory>
#include <vector>
#include <openspace/properties/stringproperty.h>
#include <openspace/properties/scalar/boolproperty.h>
//#define Debugging_Core_SceneGraphNode_Indices

2
include/openspace/util/spicemanager.h
View File

@@ -46,7 +46,7 @@ public:
using KernelHandle = unsigned int;
struct SpiceException : public ghoul::RuntimeError {
explicit SpiceException(const std::string& msg);
explicit SpiceException(std::string msg);
};
/**