[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53560] trunk/blender/source/blender: code cleanup, also remove glError check in font drawing code since its now a debug option .
Campbell Barton
ideasman42 at gmail.com
Fri Jan 4 18:24:41 CET 2013
Revision: 53560
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53560
Author: campbellbarton
Date: 2013-01-04 17:24:40 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
code cleanup, also remove glError check in font drawing code since its now a debug option.
Modified Paths:
--------------
trunk/blender/source/blender/blenfont/intern/blf_glyph.c
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/render/intern/source/rendercore.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/source/blender/blenfont/intern/blf_glyph.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_glyph.c 2013-01-04 15:06:34 UTC (rev 53559)
+++ trunk/blender/source/blender/blenfont/intern/blf_glyph.c 2013-01-04 17:24:40 UTC (rev 53560)
@@ -420,7 +420,6 @@
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);
Modified: trunk/blender/source/blender/editors/mesh/editmesh_knife.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2013-01-04 15:06:34 UTC (rev 53559)
+++ trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2013-01-04 17:24:40 UTC (rev 53560)
@@ -1333,7 +1333,8 @@
/* 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};
Modified: trunk/blender/source/blender/render/intern/source/rendercore.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rendercore.c 2013-01-04 15:06:34 UTC (rev 53559)
+++ trunk/blender/source/blender/render/intern/source/rendercore.c 2013-01-04 17:24:40 UTC (rev 53560)
@@ -2613,7 +2613,8 @@
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;
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2013-01-04 15:06:34 UTC (rev 53559)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2013-01-04 17:24:40 UTC (rev 53560)
@@ -2182,11 +2182,12 @@
/* 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));
+ }
}
}
More information about the Bf-blender-cvs
mailing list