Commit: d6457310d8fbbf08a169a2b1d5b27e2d234bb427
Author: Miguel Pozo
Date: Wed Oct 5 12:32:00 2022 +0200
Branches: tmp-workbench-rewrite2
https://developer.blender.org/rBd6457310d8fbbf08a169a2b1d5b27e2d234bb427
Fix: Compilation issue on msvc
Since smaa_textures.h is now included in cpp compilation units, areaTexBytes
and searchTexBytes must be declared as extern "C".
===================================================================
M source/blender/draw/intern/smaa_textures.h
===================================================================
diff --git a/source/blender/draw/intern/smaa_textures.h
b/source/blender/draw/intern/smaa_textures.h
index a6541f6b164..f9a0bef7047 100644
--- a/source/blender/draw/intern/smaa_textures.h
+++ b/source/blender/draw/intern/smaa_textures.h
@@ -7,6 +7,10 @@
#pragma once
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#define AREATEX_WIDTH 160
#define AREATEX_HEIGHT 560
#define AREATEX_PITCH (AREATEX_WIDTH * 2)
@@ -28,3 +32,8 @@ extern const unsigned char areaTexBytes[];
* - DX10: DXGI_FORMAT_R8_UNORM
*/
extern const unsigned char searchTexBytes[];
+
+#ifdef __cplusplus
+}
+#endif
+
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
