diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-09-20 08:54:13 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-20 08:54:13 +0400 |
commit | 79c19590e98c28d313e5cbf47453a582b4012dd6 (patch) | |
tree | 60fd19d519c512dc1497f9f0cf66a5beb626b2f4 | |
parent | c61ab5f5d1e8aa042c49bbc3653c3509559f7ac3 (diff) |
fix for bug in do_version_tface(), was assigning 'tf->mode' before tf was defined, also comment unused var.
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/material.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index cac7da76e07..3d05411a8bc 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -988,14 +988,14 @@ static void emDM_drawMappedFacesGLSL(DerivedMesh *dm, EditFace *efa; DMVertexAttribs attribs= {{{0}}}; GPUVertexAttribs gattribs; - int tfoffset; + /* int tfoffset; */ /* UNUSED */ int i, b, matnr, new_matnr, dodraw, layer; dodraw = 0; matnr = -1; layer = CustomData_get_layer_index(&em->fdata, CD_MTFACE); - tfoffset = (layer == -1)? -1: em->fdata.layers[layer].offset; + /* tfoffset = (layer == -1)? -1: em->fdata.layers[layer].offset; */ /* always use smooth shading even for flat faces, else vertex colors wont interpolate */ glShadeModel(GL_SMOOTH); diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 6b8d486ae56..aeab4b177c9 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -1932,6 +1932,9 @@ int do_version_tface(Main *main, int fileload) /* loop over all the faces and stop at the ones that use the material*/ for(a=0, mf=me->mface; a<me->totface; a++, mf++) { + /* texface data for this face */ + tf = ((MTFace*)cdl->data) + a; + if(me->mat[(int)mf->mat_nr] != ma) continue; else tf->mode |= TF_CONVERTED; } |