a82c7c1e3b
# Conflicts: # include/Engine/Rendering/Renderer.h # src/Engine/Rendering/Renderer.cpp
# Conflicts: # include/Engine/Rendering/Renderer.h # src/Engine/Rendering/Renderer.cpp