[Bf-blender-cvs] [2a2fd75ef90] master: Cleanup: Fix build error with MSVC

Ray Molenkamp noreply at git.blender.org
Tue Aug 27 16:13:30 CEST 2019


Commit: 2a2fd75ef90f18753d3d6ab33c30e60cd95bf174
Author: Ray Molenkamp
Date:   Tue Aug 27 08:13:23 2019 -0600
Branches: master
https://developer.blender.org/rB2a2fd75ef90f18753d3d6ab33c30e60cd95bf174

Cleanup: Fix build error with MSVC

`BLI_cpu_support_sse41` needs BLI_System.h.

Reviewers: brecht

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

M	source/blender/blenlib/BLI_system.h
M	source/blender/compositor/operations/COM_DenoiseOperation.cpp
M	source/blender/editors/space_node/drawnode.c

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

diff --git a/source/blender/blenlib/BLI_system.h b/source/blender/blenlib/BLI_system.h
index 19797ba23bc..8c0c9ad99bf 100644
--- a/source/blender/blenlib/BLI_system.h
+++ b/source/blender/blenlib/BLI_system.h
@@ -19,6 +19,10 @@
 
 #include <stdio.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** \file
  * \ingroup bli
  */
@@ -53,4 +57,8 @@ int BLI_system_memory_max_in_megabytes_int(void);
 #  define BLI_SYSTEM_PID_H <unistd.h>
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BLI_SYSTEM_H__ */
diff --git a/source/blender/compositor/operations/COM_DenoiseOperation.cpp b/source/blender/compositor/operations/COM_DenoiseOperation.cpp
index e7068c953fb..3aeaba539f9 100644
--- a/source/blender/compositor/operations/COM_DenoiseOperation.cpp
+++ b/source/blender/compositor/operations/COM_DenoiseOperation.cpp
@@ -21,6 +21,7 @@
 
 #include "COM_DenoiseOperation.h"
 #include "BLI_math.h"
+#include "BLI_system.h"
 #ifdef WITH_OPENIMAGEDENOISE
 #  include "BLI_threads.h"
 #  include <OpenImageDenoise/oidn.hpp>
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 72a73f89227..b89f163f579 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -24,6 +24,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_system.h"
 
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"



More information about the Bf-blender-cvs mailing list