diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-11-08 02:10:18 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-11-08 02:10:18 +0300 |
| commit | 2ead17843c08c9c4ed211010c0ad4d2a5c31a99c (patch) | |
| tree | 0fc77499284278cdf8b017eac803910c87b4e07a /source/blender/editors/mesh/editmesh.c | |
| parent | cfa4f3222a427eff1991e8fd2c341ce4ca5385bd (diff) | |
| parent | 4e9699debff6b0ac7e3bfc91d615e071218a67db (diff) | |
merge with trunk/2.5 at r24378
Diffstat (limited to 'source/blender/editors/mesh/editmesh.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c index e43a9903586..035d8dfc584 100644 --- a/source/blender/editors/mesh/editmesh.c +++ b/source/blender/editors/mesh/editmesh.c @@ -730,6 +730,13 @@ EditMesh *make_editMesh(Scene *scene, Object *ob) em->totedge= me->totedge; em->totface= me->totface; + if(tot==0) { + return; + } + + if(ob->actcol > 0) + em->mat_nr= ob->actcol-1; + actkey = ob_get_keyblock(ob); if(actkey) { keyco= actkey->data; @@ -935,8 +942,6 @@ void load_editMesh(Scene *scene, Object *ob, EditMesh *em) 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; |