[Bf-blender-cvs] [44c7a7cf8bb] blender2.8: Fix compilation error with MSVC

Clément Foucault noreply at git.blender.org
Thu Jul 19 17:18:22 CEST 2018


Commit: 44c7a7cf8bb64f58739b808ef6e80a224bfa9015
Author: Clément Foucault
Date:   Thu Jul 19 17:18:08 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB44c7a7cf8bb64f58739b808ef6e80a224bfa9015

Fix compilation error with MSVC

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

M	source/blender/windowmanager/intern/wm_init_exit.c

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

diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index f7d6561e17f..7643086e30a 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -36,6 +36,7 @@
 
 #ifdef _WIN32
 #  include <windows.h>
+#  undef interface /* fix conflict with GPU_batch.h */
 #endif
 
 #include "MEM_guardedalloc.h"



More information about the Bf-blender-cvs mailing list