mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-24 21:19:46 -06:00
6f65641290
* master: (44 commits) Remove style guide errors Add missing newline errors Update the Sun glare reference Update OpenSpace version Minor spelling, grammar, & comment cleanup Cleanup of gitignore file Started work on fixing Rosetta Jenkins compile fix Touch module capitalization compile fix Fix capitalization of includes More shader cleanup Remove dedicated logs folder Change openspaceengine to create logs folder automatically Renaming touch include files Jenkins compile fix Cleanup of shader code Jenkins compile fix Jenkins compile error Jenkins compile fix Remove fresh recompile Update Jenkinsfile to clean workspace Cleanup copyright information in shaders Second part of turning touch classes to lower case First step of turning touch classes into lower case Replacing void Renderable::render(const RenderData&) with Renderable::render(const RenderData&, RendererTasks&) ... # Conflicts: # modules/multiresvolume/rendering/localtfbrickselector.cpp # modules/multiresvolume/rendering/localtfbrickselector.h # modules/multiresvolume/rendering/renderablemultiresvolume.cpp # modules/multiresvolume/rendering/renderablemultiresvolume.h # modules/multiresvolume/rendering/shenbrickselector.h # modules/multiresvolume/rendering/simpletfbrickselector.cpp # modules/multiresvolume/rendering/simpletfbrickselector.h # modules/multiresvolume/rendering/tfbrickselector.cpp # modules/multiresvolume/rendering/tfbrickselector.h # modules/multiresvolume/rendering/tsp.cpp # src/performance/performancemanager.cpp