diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-10-03 16:07:29 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-10-03 16:07:29 +0400 |
| commit | 0ef61bb816b88e938ffe5d9df5e72a2fd2688dc9 (patch) | |
| tree | bb34f1e687f154e7d32837bfd58a081e11158b7e | |
| parent | 139524b144e40e46d08d9d1f24f436ff0cb152f2 (diff) | |
Correction to commit rev48866 -- convert_tface_mt must happen before BKE_mesh_do_versions_convert_mfaces_to_mpolys
Discovered when were looking into crystal_cube.blend from our regression files
collection. Now it should look the same as in 2.62 release. 2.63 release wouldn't
work correct for this file because of wrong mtface->material conversion after
bmesh merge.
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 97aa21cea40..aa44b01544f 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3665,7 +3665,14 @@ static void lib_link_mesh(FileData *fd, Main *main) if (me->mr && me->mr->levels.first) lib_link_customdata_mtface(fd, me, &me->mr->fdata, ((MultiresLevel*)me->mr->levels.first)->totface); - + } + } + + /* convert texface options to material */ + convert_tface_mt(fd, main); + + for (me = main->mesh.first; me; me = me->id.next) { + if (me->id.flag & LIB_NEED_LINK) { /*check if we need to convert mfaces to mpolys*/ if (me->totface && !me->totpoly) { /* temporarily switch main so that reading from @@ -3677,14 +3684,7 @@ static void lib_link_mesh(FileData *fd, Main *main) G.main = gmain; } - } - } - - /* convert texface options to material */ - convert_tface_mt(fd, main); - for (me = main->mesh.first; me; me = me->id.next) { - if (me->id.flag & LIB_NEED_LINK) { /* * Re-tessellate, even if the polys were just created from tessfaces, this * is important because it: |