From 8b747cee182cd8e95063fa152d9b5d7383cb1c74 Mon Sep 17 00:00:00 2001 From: RunitaiLinden Date: Mon, 6 May 2024 16:49:24 -0500 Subject: BOOL to bool --- indra/newview/llgltfmaterialpreviewmgr.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/llgltfmaterialpreviewmgr.h') diff --git a/indra/newview/llgltfmaterialpreviewmgr.h b/indra/newview/llgltfmaterialpreviewmgr.h index 981c8b0592..80f09ece88 100644 --- a/indra/newview/llgltfmaterialpreviewmgr.h +++ b/indra/newview/llgltfmaterialpreviewmgr.h @@ -40,10 +40,10 @@ public: // Width scales with size of material's textures static LLPointer create(LLPointer material); - BOOL needsRender() override; - void preRender(BOOL clear_depth = TRUE) override; - BOOL render() override; - void postRender(BOOL success) override; + bool needsRender() override; + void preRender(bool clear_depth = TRUE) override; + bool render() override; + void postRender(bool success) override; struct MaterialLoadLevels { -- cgit v1.2.3 From 799ebf21624edb8b42ca16b8cf51c138643efd32 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 10 May 2024 15:16:06 +0200 Subject: Fix broken merge and BOOL/bool issues --- indra/newview/llgltfmaterialpreviewmgr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llgltfmaterialpreviewmgr.h') diff --git a/indra/newview/llgltfmaterialpreviewmgr.h b/indra/newview/llgltfmaterialpreviewmgr.h index 80f09ece88..f320886157 100644 --- a/indra/newview/llgltfmaterialpreviewmgr.h +++ b/indra/newview/llgltfmaterialpreviewmgr.h @@ -41,7 +41,7 @@ public: static LLPointer create(LLPointer material); bool needsRender() override; - void preRender(bool clear_depth = TRUE) override; + void preRender(bool clear_depth = true) override; bool render() override; void postRender(bool success) override; -- cgit v1.2.3