diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-09-20 13:44:29 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-11-27 18:10:07 +0300 |
commit | 73fa066e8b3ca4e3ff4a34a328a12b575dfc5823 (patch) | |
tree | 4a659e5e24fc77735a5c6aeed12498d823126c49 /source/blender/editors | |
parent | 83d3a7c12d80d360268f36878e8ffc2832544b3c (diff) |
Cleanup: Remove BIF_gl.h
BIF_gl.h included hacks like redefining glew functions and a constant.
The named constant `GLA_PIXEL_OFS` has been moved to `GPU_viewport.h`
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D5860
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/include/BIF_gl.h | 44 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_eyedropper_color.c | 2 | ||||
-rw-r--r-- | source/blender/editors/mesh/editface.c | 2 | ||||
-rw-r--r-- | source/blender/editors/render/render_preview.c | 2 | ||||
-rw-r--r-- | source/blender/editors/util/CMakeLists.txt | 1 |
5 files changed, 2 insertions, 49 deletions
diff --git a/source/blender/editors/include/BIF_gl.h b/source/blender/editors/include/BIF_gl.h deleted file mode 100644 index 84820c3c564..00000000000 --- a/source/blender/editors/include/BIF_gl.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * os dependent include locations of gl.h - */ - -/** \file - * \ingroup editorui - */ - -#ifndef __BIF_GL_H__ -#define __BIF_GL_H__ - -#include "GPU_glew.h" -#include "BLI_utildefines.h" - -/* hacking pointsize and linewidth */ -#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) -# define glPointSize(f) \ - glPointSize(U.pixelsize *_Generic((f), double : (float)(f), default : (f))) -# define glLineWidth(f) \ - glLineWidth(U.pixelsize *_Generic((f), double : (float)(f), default : (f))) -#else -# define glPointSize(f) glPointSize(U.pixelsize *(f)) -# define glLineWidth(f) glLineWidth(U.pixelsize *(f)) -#endif /* C11 */ - -#define GLA_PIXEL_OFS 0.375f - -#endif /* #ifdef __BIF_GL_H__ */ diff --git a/source/blender/editors/interface/interface_eyedropper_color.c b/source/blender/editors/interface/interface_eyedropper_color.c index 0cf357c508b..2b5cf2ed6b9 100644 --- a/source/blender/editors/interface/interface_eyedropper_color.c +++ b/source/blender/editors/interface/interface_eyedropper_color.c @@ -39,7 +39,7 @@ #include "RNA_access.h" -#include "BIF_gl.h" +#include "GPU_glew.h" #include "UI_interface.h" diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index b7f506a8a41..5c9fb866df7 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -36,8 +36,6 @@ #include "BKE_global.h" #include "BKE_mesh.h" -#include "BIF_gl.h" - #include "ED_mesh.h" #include "ED_screen.h" #include "ED_select_utils.h" diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 6dc3a1ec1ac..1fe299e58a9 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -80,10 +80,10 @@ #include "IMB_imbuf_types.h" #include "IMB_thumbs.h" -#include "BIF_gl.h" #include "BIF_glutil.h" #include "GPU_shader.h" +#include "GPU_glew.h" #include "RE_pipeline.h" #include "RE_engine.h" diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index 0c52dd15092..987327eefc1 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -44,7 +44,6 @@ set(SRC select_utils.c # general includes - ../include/BIF_gl.h ../include/BIF_glutil.h ../include/ED_anim_api.h ../include/ED_armature.h |