diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-11-05 17:54:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-11-05 17:54:02 +0300 |
| commit | 5481549725fbe50152f6829b50b23d7206d4294b (patch) | |
| tree | 5a385863732a7db5a491d0328990f75316245f06 /source/blender/editors/mesh/editmesh.c | |
| parent | 59eaa1ff50e6b6c94a55ccac934cea283eae1659 (diff) | |
was setting the active material on exit editmode rather then enter
Diffstat (limited to 'source/blender/editors/mesh/editmesh.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c index 8b9de0f6348..81d565a9ba4 100644 --- a/source/blender/editors/mesh/editmesh.c +++ b/source/blender/editors/mesh/editmesh.c @@ -777,6 +777,9 @@ void make_editMesh(Scene *scene, Object *ob) 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 @@ void load_editMesh(Scene *scene, Object *ob) 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; |