diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-08-24 06:29:45 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-24 06:29:45 +0400 |
commit | fd4575b2e3e47fb331ac6c9b30fb23cfb05a53ae (patch) | |
tree | fc22ef5086c488010fbc3d5058198d1686260562 /source/blender/blenkernel/intern/multires.c | |
parent | 98f87b77f40b5617409ccc026be604fcaaff9f8e (diff) | |
parent | f9bffb3ca0ca88a7e774b0ee0da1d384707f0495 (diff) |
svn merge -r39493:39664 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/intern/multires.c')
-rw-r--r-- | source/blender/blenkernel/intern/multires.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 10efb970be1..87820661fe0 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -1703,6 +1703,7 @@ void multires_load_old(Object *ob, Mesh *me) me->mface[i].v2 = lvl->faces[i].v[1]; me->mface[i].v3 = lvl->faces[i].v[2]; me->mface[i].v4 = lvl->faces[i].v[3]; + me->mface[i].mat_nr = lvl->faces[i].mat_nr; } /* Add a multires modifier to the object */ |