mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-19 00:12:43 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
76a2f786767c09354fc689e8abf6270bb382e8cb
OpenSpace/include/openspace/rendering/renderable.h
Alexander Bock c6dc426211 Merge remote-tracking branch 'origin/feature/galaxy' into develop 
Conflicts:
	data/scene/default.scene
	shaders/PowerScaling/powerScalingMath.hglsl
2016-06-04 19:54:34 +02:00

4.0 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink