mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 19:29:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jonathas Costa
2016-10-29 13:43:21 -04:00
parent 2ca0bfd798 c7809cb6cf
commit 420f56355a
5 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/base/rendering/renderablesphere.cpp
+1 -2
View File
@@ -22,7 +22,6 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/base/rendering/renderablesphere.h>
#include <openspace/engine/openspaceengine.h>
@@ -122,7 +121,7 @@ bool RenderableSphere::initialize() {
RenderEngine& renderEngine = OsEng.renderEngine();
_shader = renderEngine.buildRenderProgram("Sphere",
"${MODULE_BASE}/shaders/sphere_vs.glsl",
"${MODULES}/base/shaders/sphere_fs.glsl");
"${MODULE_BASE}/shaders/sphere_fs.glsl");
if (!_shader)
return false;