[Bf-blender-cvs] [9c5bec0292d] master: space_file: fix build error with msvc.

Ray Molenkamp noreply at git.blender.org
Wed May 15 17:13:12 CEST 2019


Commit: 9c5bec0292d23efb626260027ed826831faefc83
Author: Ray Molenkamp
Date:   Wed May 15 09:13:07 2019 -0600
Branches: master
https://developer.blender.org/rB9c5bec0292d23efb626260027ed826831faefc83

space_file: fix build error with msvc.

Both windows.h and wm_types.h define HKEY, moving wm_types after windows.h
sidesteps the issue, since HKEY isn't used in fsmenu.c it doesn't cause
problems.

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

M	source/blender/editors/space_file/fsmenu.c

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

diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c
index 25187d56d7e..208ba73b8a6 100644
--- a/source/blender/editors/space_file/fsmenu.c
+++ b/source/blender/editors/space_file/fsmenu.c
@@ -35,9 +35,6 @@
 
 #include "ED_fileselect.h"
 
-#include "WM_api.h"
-#include "WM_types.h"
-
 #ifdef WIN32
 /* Need to include windows.h so _WIN32_IE is defined. */
 #  include <windows.h>
@@ -47,6 +44,10 @@
 #  include "BLI_winstuff.h"
 #endif
 
+#include "WM_api.h"
+#include "WM_types.h"
+
+
 #ifdef __APPLE__
 #  include <Carbon/Carbon.h>
 #endif /* __APPLE__ */



More information about the Bf-blender-cvs mailing list