diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2019-05-15 18:13:07 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2019-05-15 18:13:07 +0300 |
| commit | 9c5bec0292d23efb626260027ed826831faefc83 (patch) | |
| tree | e49b1f3b105caba7ff48bba0f635ebfe096385fb /source/blender/editors/space_file | |
| parent | 39403c1e71c69c4d1cfa3046911ca34d35b1f086 (diff) | |
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.
Diffstat (limited to 'source/blender/editors/space_file')
| -rw-r--r-- | source/blender/editors/space_file/fsmenu.c | 7 |
1 files changed, 4 insertions, 3 deletions
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__ */ |