From 769f1db011fa4d2fbe6526abb3589bb9e9e2154f Mon Sep 17 00:00:00 2001 From: Philip Rideout Date: Tue, 1 Oct 2019 08:05:54 -0700 Subject: [PATCH] Fix ambiguous atomic-to-bool conversion. --- filament/src/details/Material.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filament/src/details/Material.h b/filament/src/details/Material.h index ef7ae259fc..efd8e0d4c9 100644 --- a/filament/src/details/Material.h +++ b/filament/src/details/Material.h @@ -79,7 +79,7 @@ public: backend::Handle getPostProcessProgramSlow(uint8_t variantKey) const noexcept; backend::Handle getProgram(uint8_t variantKey) const noexcept { #if FILAMENT_ENABLE_MATDBG - if (UTILS_UNLIKELY(mPendingEdits)) { + if (UTILS_UNLIKELY(mPendingEdits.load())) { const_cast(this)->applyPendingEdits(); } #endif