Merge branch 'master' into feature/multitexturing

* Resolve conflicts
2026-04-20 01:01:10 -05:00 · 2021-03-02 15:49:39 +01:00
parent acc2947576 97144df4da
commit 4fb8a36952
229 changed files with 42756 additions and 19212 deletions
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -500,13 +500,11 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) {
    );
    _program->setUniform(
        _uniformCache.lightIntensities,
-        _lightIntensitiesBuffer.data(),
-        nLightSources
+        _lightIntensitiesBuffer
    );
    _program->setUniform(
        _uniformCache.lightDirectionsViewSpace,
-        _lightDirectionsViewSpaceBuffer.data(),
-        nLightSources
+        _lightDirectionsViewSpaceBuffer
    );
    _program->setUniform(
        _uniformCache.modelViewTransform,