From 93fc6cb680dfc3e53aa5810cbe4661263cd13d9a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 22 Aug 2008 00:54:22 +0000 Subject: missing NULL check when game text meshes had no vertex colors --- source/blender/src/drawmesh.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/source/blender/src/drawmesh.c b/source/blender/src/drawmesh.c index df224585538..d9ebd175dec 100644 --- a/source/blender/src/drawmesh.c +++ b/source/blender/src/drawmesh.c @@ -484,7 +484,7 @@ void draw_mesh_text(Object *ob, int glsl) ddm = mesh_get_derived_deform(ob, CD_MASK_BAREMESH); - for(a=0, mf=mface; amode; int matnr= mf->mat_nr; int mf_smooth= mf->flag & ME_SMOOTH; @@ -506,8 +506,10 @@ void draw_mesh_text(Object *ob, int glsl) } else { badtex = set_draw_settings_cached(0, Gtexdraw.istex, tface, Gtexdraw.islit, Gtexdraw.ob, matnr, TF_TWOSIDE); - if (badtex) + if (badtex) { + mcol+=4; continue; + } } ddm->getVertCo(ddm, mf->v1, v1); @@ -535,6 +537,9 @@ void draw_mesh_text(Object *ob, int glsl) GPU_render_text(tface, tface->mode, string, characters, (unsigned int*)mcol, v1, v2, v3, (mf->v4? v4: NULL), glattrib); } + if (mcol) { + mcol+=4; + } } ddm->release(ddm); -- cgit v1.2.3