[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24352] trunk/blender/source/blender/ editors/mesh/editmesh.c: was setting the active material on exit editmode rather then enter

[Campbell Barton]

Revision: 24352
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24352
Author:   campbellbarton
Date:     2009-11-05 15:54:02 +0100 (Thu, 05 Nov 2009)

Log Message:
-----------
was setting the active material on exit editmode rather then enter

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/editmesh.c

Modified: trunk/blender/source/blender/editors/mesh/editmesh.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh.c	2009-11-05 14:42:39 UTC (rev 24351)
+++ trunk/blender/source/blender/editors/mesh/editmesh.c	2009-11-05 14:54:02 UTC (rev 24352)
@@ -777,6 +777,9 @@
 		return;
 	}
 	
+	if(ob->actcol > 0)
+		em->mat_nr= ob->actcol-1;
+
 	/* initialize fastmalloc for editmesh */
 	init_editmesh_fastmalloc(em, me->totvert, me->totedge, me->totface);
 
@@ -990,8 +993,6 @@
 	CustomData_add_layer(&me->fdata, CD_MFACE, CD_ASSIGN, mface, me->totface);
 	mesh_update_customdata_pointers(me);
 
-	em->mat_nr= ob->actcol-1;
-
 	/* the vertices, use ->tmp.l as counter */
 	eve= em->verts.first;
 	a= 0;