svn merge -r 13148:13177 https://svn.blender.org/svnroot/bf-blender/trunk/blender + fixed one crash on enabling deflection

1 files changed, 18 insertions, 36 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 96b0c372835..54d405132a9 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6661,29 +6661,9 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 		World *wrld;
 		
 		if(main->versionfile != 244 || main->subversionfile < 2) {
-			Mesh *me;
-			
 			for(sce= main->scene.first; sce; sce= sce->id.next)
 				sce->r.mode |= R_SSS;
 
-			/* Copy over old per-level multires vertex data
-			   into a single vertex array in struct Multires */
-			
-			for(me = main->mesh.first; me; me=me->id.next) {
-				if(me->mr) {
-					MultiresLevel *lvl = me->mr->levels.last;
-					if(lvl) {
-						me->mr->verts = lvl->verts;
-						lvl->verts = NULL;
-						/* Don't need the other vert arrays */
-						for(lvl = lvl->prev; lvl; lvl = lvl->prev) {
-							MEM_freeN(lvl->verts);
-							lvl->verts = NULL;
-						}
-					}
-				}
-			}
-	
 			/* correct older action editors - incorrect scrolling */
 			for(sc= main->screen.first; sc; sc= sc->id.next) {
 				ScrArea *sa;
@@ -6737,6 +6717,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 		Lamp *la;
 		Material *ma;
 		ParticleSettings *part;
+		Mesh *me;
 		
 		/* unless the file was created 2.44.3 but not 2.45, update the constraints */
 		if ( !(main->versionfile==244 && main->subversionfile==3) &&
@@ -6766,14 +6747,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 									curcon->ownspace = CONSTRAINT_SPACE_LOCAL;
 							}
 								break;
-							case CONSTRAINT_TYPE_STRETCHTO:
-							{
-								bStretchToConstraint *data= (bStretchToConstraint *)curcon->data;
-								
-								/* force recalc of rest-length */
-								data->orglength = 0;
-							}
-								break;
 						}	
 					}
 				}
@@ -6805,14 +6778,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 											curcon->tarspace = CONSTRAINT_SPACE_LOCAL;
 									}							
 										break;
-									case CONSTRAINT_TYPE_STRETCHTO:
-									{
-										bStretchToConstraint *data= (bStretchToConstraint *)curcon->data;
-										
-										/* force recalc of rest-length */
-										data->orglength = 0;
-									}
-										break;
 								}
 							}
 							
@@ -6876,6 +6841,23 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 				}
 			}
 		}
+
+		/* Copy over old per-level multires vertex data
+		   into a single vertex array in struct Multires */
+		for(me = main->mesh.first; me; me=me->id.next) {
+			if(me->mr && !me->mr->verts) {
+				MultiresLevel *lvl = me->mr->levels.last;
+				if(lvl) {
+					me->mr->verts = lvl->verts;
+					lvl->verts = NULL;
+					/* Don't need the other vert arrays */
+					for(lvl = lvl->prev; lvl; lvl = lvl->prev) {
+						MEM_freeN(lvl->verts);
+						lvl->verts = NULL;
+					}
+				}
+			}
+		}
 		
 		if (main->versionfile != 245 || main->subversionfile < 1) {
 			for(la=main->lamp.first; la; la= la->id.next) {