Skip to content

Commit 13ef68f

Browse files
committed
Merge branch 'master' of https://github.com/pezcode/Cluster
2 parents 67205ac + 8f38493 commit 13ef68f

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/Log/UISink.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class clusterui_sink : public sinks::base_sink<Mutex>
2121
{
2222
// msg.payload is the raw string without any formatting
2323
memory_buf_t formatted;
24-
base_sink::formatter_->format(msg, formatted);
24+
this->formatter_->format(msg, formatted);
2525
func(fmt::to_string(formatted).c_str(), msg.level);
2626
}
2727

src/Renderer/DeferredRenderer.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
#include <glm/matrix.hpp>
88
#include <glm/gtc/type_ptr.hpp>
99

10+
constexpr bgfx::TextureFormat::Enum DeferredRenderer::gBufferAttachmentFormats[DeferredRenderer::GBufferAttachment::Count - 1];
11+
1012
DeferredRenderer::DeferredRenderer(const Scene* scene) :
1113
Renderer(scene),
1214
pointLightVertexBuffer(BGFX_INVALID_HANDLE),

0 commit comments

Comments
 (0)