[Bf-blender-cvs] [e1b2ded7b2f] master: Fix build WITH_CXX_GUARDEDALLOC
Germano Cavalcante
noreply at git.blender.org
Thu Mar 19 18:51:47 CET 2020
Commit: e1b2ded7b2fcce4e2ae295545a57cde3d7c6d950
Author: Germano Cavalcante
Date: Thu Mar 19 14:42:04 2020 -0300
Branches: master
https://developer.blender.org/rBe1b2ded7b2fcce4e2ae295545a57cde3d7c6d950
Fix build WITH_CXX_GUARDEDALLOC
===================================================================
M intern/dualcon/intern/ModelReader.h
M source/blender/compositor/intern/COM_ExecutionGroup.h
===================================================================
diff --git a/intern/dualcon/intern/ModelReader.h b/intern/dualcon/intern/ModelReader.h
index 0f056724a62..d1f42466cfe 100644
--- a/intern/dualcon/intern/ModelReader.h
+++ b/intern/dualcon/intern/ModelReader.h
@@ -19,6 +19,10 @@
#include "GeoCommon.h"
+#ifdef WITH_CXX_GUARDEDALLOC
+# include "MEM_guardedalloc.h"
+#endif
+
/*
* Virtual class for input file readers
*
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h
index 1989a6f6205..0299dad2ee8 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.h
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.h
@@ -19,6 +19,10 @@
#ifndef __COM_EXECUTIONGROUP_H__
#define __COM_EXECUTIONGROUP_H__
+#ifdef WITH_CXX_GUARDEDALLOC
+# include "MEM_guardedalloc.h"
+#endif
+
#include "BLI_rect.h"
#include "COM_CompositorContext.h"
#include "COM_Device.h"
More information about the Bf-blender-cvs
mailing list