diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2019-12-02 03:40:58 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2019-12-02 03:40:58 +0300 |
commit | a35c635edb3db548e11555024ec3a384f93ce352 (patch) | |
tree | ae0c0c9435c2e7daed4cbd916e0be90df7898b51 /source/blender/windowmanager/intern/wm_dragdrop.c | |
parent | 7164e63fefcfa26caf387a2ad04a8c51b533c32b (diff) | |
parent | f1ac64921b49eaea8658d144754a1a532198c720 (diff) |
Merge branch 'master' into tmp-overlay-enginetmp-overlay-engine
# Conflicts:
# source/blender/draw/modes/paint_texture_mode.c
Diffstat (limited to 'source/blender/windowmanager/intern/wm_dragdrop.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_dragdrop.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_dragdrop.c b/source/blender/windowmanager/intern/wm_dragdrop.c index 901594850dd..e2462bb59b1 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.c +++ b/source/blender/windowmanager/intern/wm_dragdrop.c @@ -34,14 +34,15 @@ #include "BLI_blenlib.h" -#include "BIF_gl.h" #include "BIF_glutil.h" #include "BKE_context.h" #include "BKE_idcode.h" +#include "GPU_glew.h" #include "GPU_shader.h" #include "GPU_state.h" +#include "GPU_viewport.h" #include "IMB_imbuf_types.h" |