[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40480] branches/bmesh/blender: svn merge ^/trunk/blender -r40379:40381

[Campbell Barton]

Revision: 40480
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40480
Author:   campbellbarton
Date:     2011-09-23 06:31:36 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r40379:40381

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40379

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/material.c

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/
    branches/bmesh/blender/source/blender/editors/space_outliner/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:39992-40379
   + /trunk/blender:39992-40381


Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release:31524-40379
   + /trunk/blender/release:31524-40381

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/material.c	2011-09-23 06:18:03 UTC (rev 40479)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/material.c	2011-09-23 06:31:36 UTC (rev 40480)
@@ -1931,9 +1931,13 @@
 					if (!cdl) continue;
 			
 					/* 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++) {
-						if(me->mat[(int)mf->mat_nr] != ma) continue;
-						else tf->mode |= TF_CONVERTED;
+					for (a=0, mf=me->mface; a<me->totface; a++, mf++) {
+						if (me->mat[(int)mf->mat_nr] != ma) continue;
+						else {
+							/* texface data for this face */
+							tf = ((MTFace*)cdl->data) + a;
+							tf->mode |= TF_CONVERTED;
+						}
 					}
 				}
 			}


Property changes on: branches/bmesh/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-40379
   + /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-40381