diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-04-04 22:39:57 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-04-04 22:39:57 +0300 |
| commit | 7576ad3d043ac5d15e0c5a68e65339904441b5e7 (patch) | |
| tree | bb990cce1eec04d45ab57e8a42af2669f9d7522f /source/blender/windowmanager/intern/wm_draw.c | |
| parent | 10b24eabbab0193f6944cdf3bec7b386c75d5445 (diff) | |
| parent | db0f67f46454fd0bfeb886d3e61227b65fbc6ac1 (diff) | |
Merge branch 'blender2.8' into transform-manipulatorstransform-manipulators
Conflicts:
intern/gawain/gawain/immediate.h
intern/gawain/src/immediate.c
source/blender/editors/physics/physics_ops.c
source/blender/editors/screen/glutil.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_ops.c
source/blender/editors/transform/transform_manipulator.c
Diffstat (limited to 'source/blender/windowmanager/intern/wm_draw.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_draw.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index 809a5cac6e8..daba01cb3a6 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -57,8 +57,6 @@ #include "GPU_draw.h" #include "GPU_extensions.h" -#include "GPU_glew.h" -#include "GPU_basic_shader.h" #include "GPU_immediate.h" #include "RE_engine.h" |