Alexander Bock af6e15da40 Merge remote-tracking branch 'origin/master' into feature/openglstatecache ...

# Conflicts:
#	ext/ghoul
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	src/util/screenlog.cpp

2020-09-04 14:02:17 +02:00

..

renderablebillboardscloud.cpp

Merge remote-tracking branch 'origin/master' into feature/openglstatecache

2020-09-04 14:02:17 +02:00

renderablebillboardscloud.h

Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet).

2020-08-20 15:34:40 -04:00

renderabledumeshes.cpp

Coding style adaptations

2020-08-25 13:47:03 +02:00

renderabledumeshes.h

Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet).

2020-08-20 15:34:40 -04:00

renderableplanescloud.cpp

Merge remote-tracking branch 'origin/master' into feature/openglstatecache

2020-09-04 14:02:17 +02:00

renderableplanescloud.h

Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet).

2020-08-20 15:34:40 -04:00

renderablepoints.cpp

Add more Tracy markers in different renderables

2020-08-18 12:58:40 +02:00

renderablepoints.h

Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet).

2020-08-20 15:34:40 -04:00