Alexander Bock 88cf7926ae Merge branch 'master' into feature/loadingscreen-refactor ...

# Conflicts:
#	modules/galaxy/rendering/renderablegalaxy.cpp

2017-11-09 10:51:56 -05:00

..

basicvolumeraycaster.cpp

Cleanup for coding style

2017-11-08 10:35:39 -06:00

basicvolumeraycaster.h

Volume conversion and rendering (#350)

2017-09-22 12:03:23 +02:00

renderabletimevaryingvolume.cpp

Cleanup for coding style

2017-11-08 10:35:39 -06:00

renderabletimevaryingvolume.h

Cleanup for coding style

2017-11-08 10:35:39 -06:00

volumeclipplane.cpp

Volume conversion and rendering (#350)

2017-09-22 12:03:23 +02:00

volumeclipplane.h

Volume conversion and rendering (#350)

2017-09-22 12:03:23 +02:00

volumeclipplanes.cpp

More coding style fixes

2017-11-08 21:36:06 -06:00

volumeclipplanes.h

Volume conversion and rendering (#350)

2017-09-22 12:03:23 +02:00