[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51019] trunk/blender/source/blender/ blenloader/intern/readfile.c: Correction to commit rev48866 -- convert_tface_mt must happen before BKE_mesh_do_versions_convert_mfaces_to_mpolys

[Sergey Sharybin]

Revision: 51019
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51019
Author:   nazgul
Date:     2012-10-03 12:07:29 +0000 (Wed, 03 Oct 2012)
Log Message:
-----------
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.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48866

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2012-10-03 09:41:58 UTC (rev 51018)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-10-03 12:07:29 UTC (rev 51019)
@@ -3665,7 +3665,14 @@
 			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 @@
 				
 				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: