diff --git a/data/scene/stars/digitaluniverse/digitaluniverse.mod b/data/scene/stars/digitaluniverse/digitaluniverse.mod index 608185c013..469de18dd4 100644 --- a/data/scene/stars/digitaluniverse/digitaluniverse.mod +++ b/data/scene/stars/digitaluniverse/digitaluniverse.mod @@ -6,6 +6,7 @@ return { Renderable = { Type = "RenderableStars", File = "speck/stars.speck", + -- File = "speck/stars_new.speck", Texture = "textures/halo.png", ColorMap = "colorbv.cmap" }, diff --git a/ext/sgct b/ext/sgct index a13b539088..81d1fe53b2 160000 --- a/ext/sgct +++ b/ext/sgct @@ -1 +1 @@ -Subproject commit a13b539088df0e4ff777cefff27184f30d3d33c7 +Subproject commit 81d1fe53b26f28c244ea96536918828530069922 diff --git a/modules/touch/include/touchmarker.h b/modules/touch/include/touchmarker.h index 60a601b845..6e13095115 100644 --- a/modules/touch/include/touchmarker.h +++ b/modules/touch/include/touchmarker.h @@ -65,9 +65,9 @@ class TouchMarker : public properties::PropertyOwner { std::unique_ptr _shader; - GLuint _quad; - GLuint _vertexPositionBuffer; - int _numFingers; + GLuint _quad = 0; + GLuint _vertexPositionBuffer = 0; + int _numFingers = 0; }; } // openspace namespace diff --git a/scripts/configuration_helper.lua b/scripts/configuration_helper.lua index 036865a67b..cfb62880c3 100644 --- a/scripts/configuration_helper.lua +++ b/scripts/configuration_helper.lua @@ -290,7 +290,7 @@ function generateSettings(arg) local refresh = "" if arg["refreshRate"] then - refresh = "refreshRate=" .. arg["refreshRate"] .. " " + refresh = "refreshRate=\"" .. arg["refreshRate"] .. "\" " end