[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40380] trunk/blender/source/blender/ blenkernel/intern: fix for bug in do_version_tface(), was assigning 'tf-> mode' before tf was defined, also comment unused var.

Campbell Barton ideasman42 at gmail.com
Tue Sep 20 06:54:14 CEST 2011


Revision: 40380
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40380
Author:   campbellbarton
Date:     2011-09-20 04:54:13 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
fix for bug in do_version_tface(), was assigning 'tf->mode' before tf was defined, also comment unused var.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
    trunk/blender/source/blender/blenkernel/intern/material.c

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-09-20 04:45:01 UTC (rev 40379)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-09-20 04:54:13 UTC (rev 40380)
@@ -988,14 +988,14 @@
 	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);

Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c	2011-09-20 04:45:01 UTC (rev 40379)
+++ trunk/blender/source/blender/blenkernel/intern/material.c	2011-09-20 04:54:13 UTC (rev 40380)
@@ -1932,6 +1932,9 @@
 			
 					/* 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;
 					}




More information about the Bf-blender-cvs mailing list