diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-01-04 21:24:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-04 21:24:40 +0400 |
| commit | 419016928216707f95fa7b94d233b0bb8707ff3c (patch) | |
| tree | c2aa61ef650533cd9579103b8b427e8c2eb06d60 | |
| parent | 0f565149864ac34d54c5a0e517a8db88cf67a6d6 (diff) | |
code cleanup, also remove glError check in font drawing code since its now a debug option.
| -rw-r--r-- | source/blender/blenfont/intern/blf_glyph.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_knife.c | 3 | ||||
| -rw-r--r-- | source/blender/render/intern/source/rendercore.c | 3 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 7 |
4 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c index 2c582133b15..9c7623f3757 100644 --- a/source/blender/blenfont/intern/blf_glyph.c +++ b/source/blender/blenfont/intern/blf_glyph.c @@ -420,7 +420,6 @@ int blf_glyph_render(FontBLF *font, GlyphBLF *g, float x, float y) glBindTexture(GL_TEXTURE_2D, g->tex); glTexSubImage2D(GL_TEXTURE_2D, 0, g->xoff, g->yoff, g->width, g->height, GL_ALPHA, GL_UNSIGNED_BYTE, g->bitmap); - BLI_assert(glGetError() == GL_NO_ERROR); glPopClientAttrib(); g->uv[0][0] = ((float)g->xoff) / ((float)gc->p2_width); diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 542d568f7b8..590bcd5939e 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -1333,7 +1333,8 @@ static void calc_ortho_extent(KnifeTool_OpData *kcd) /* Clip the line (v1, v2) to planes perpendicular to it and distances d from * the closest point on the line to the origin */ -static void clip_to_ortho_planes(float v1[3], float v2[3], float d) { +static void clip_to_ortho_planes(float v1[3], float v2[3], float d) +{ float closest[3]; const float origin[3] = {0.0f, 0.0f, 0.0f}; diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index 90ff96d7a64..14586f16478 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -2613,7 +2613,8 @@ static int get_next_bake_face(BakeShade *bs) return 0; } -static void bake_single_vertex(BakeShade *bs, VertRen *vert, float u, float v) { +static void bake_single_vertex(BakeShade *bs, VertRen *vert, float u, float v) +{ int *origindex, i; MLoopCol *basevcol; MLoop *mloop; diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index a42986eba60..a6b3efd30bf 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2182,11 +2182,12 @@ void wm_event_do_handlers(bContext *C) /* update key configuration after handling events */ WM_keyconfig_update(wm); - - if(G.debug) { + + if (G.debug) { GLenum error = glGetError(); - if (error) + if (error != GL_NO_ERROR) { printf("GL error: %s\n", gluErrorString(error)); + } } } |