bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix possible crasg in recent texface commit - material pointer could be used un-inirialized.

Browse Source
This commit is contained in:
Campbell Barton 2011-09-20 04:45:01 +00:00
parent 6791052832
commit c61ab5f5d1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/space_view3d/drawmesh.c
View File

@ -518,15 +518,14 @@ static int draw_em_tf_mapped__set_draw(void *userData, int index)
static int wpaint__setSolidDrawOptions(void *userData, int index, int *drawSmooth_r) static int wpaint__setSolidDrawOptions(void *userData, int index, int *drawSmooth_r)
{ {
Mesh *me = (Mesh*)userData; Mesh *me = (Mesh*)userData;
Material *ma;
if (me->mface) { if (me->mface) {
int matnr = me->mface[index].mat_nr; short matnr= me->mface[index].mat_nr;
ma = me->mat[matnr]; Material *ma= me->mat[matnr];
}
if ( ma && (ma->game.flag & GEMAT_INVISIBLE)) { if (ma && (ma->game.flag & GEMAT_INVISIBLE)) {
return 0; return 0;
}
} }
*drawSmooth_r = 1; *drawSmooth_r = 1;