[Bf-blender-cvs] [9553ba13730] master: Fix compile error with 'WITH_CXX_GUARDEDALLOC'

Germano Cavalcante noreply at git.blender.org
Tue Jun 8 15:35:13 CEST 2021


Commit: 9553ba1373007a93dd45e477c03c085526140e19
Author: Germano Cavalcante
Date:   Tue Jun 8 10:18:16 2021 -0300
Branches: master
https://developer.blender.org/rB9553ba1373007a93dd45e477c03c085526140e19

Fix compile error with 'WITH_CXX_GUARDEDALLOC'

Seen with msvc

===================================================================

M	source/blender/compositor/intern/COM_MemoryProxy.h
M	source/blender/compositor/intern/COM_WorkPackage.h

===================================================================

diff --git a/source/blender/compositor/intern/COM_MemoryProxy.h b/source/blender/compositor/intern/COM_MemoryProxy.h
index 931fd8d2622..6814afada74 100644
--- a/source/blender/compositor/intern/COM_MemoryProxy.h
+++ b/source/blender/compositor/intern/COM_MemoryProxy.h
@@ -18,6 +18,10 @@
 
 #pragma once
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#  include "MEM_guardedalloc.h"
+#endif
+
 #include "COM_defines.h"
 
 namespace blender::compositor {
diff --git a/source/blender/compositor/intern/COM_WorkPackage.h b/source/blender/compositor/intern/COM_WorkPackage.h
index 4d503022120..f0f53f300a5 100644
--- a/source/blender/compositor/intern/COM_WorkPackage.h
+++ b/source/blender/compositor/intern/COM_WorkPackage.h
@@ -18,6 +18,10 @@
 
 #pragma once
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#  include "MEM_guardedalloc.h"
+#endif
+
 #include "COM_Enums.h"
 
 #include "BLI_rect.h"



More information about the Bf-blender-cvs mailing list