Removed *yet more!* old crufty multires stuff. I think this is all of it now.

6 files changed, 20 insertions, 47 deletions

diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 7e757d4031b..5639e0116de 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -4754,8 +4754,6 @@ void do_meshbuts(unsigned short event)
 					shadeMeshMCol(ob, me);
 			}
 			
-			if (me->mr) multires_load_cols(me);
-
 			DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
 			BIF_undo_push("New Vertex Color");
 			allqueue(REDRAWVIEW3D, 0);
diff --git a/source/blender/src/editface.c b/source/blender/src/editface.c
index 781210cd373..5f76e15b6c7 100644
--- a/source/blender/src/editface.c
+++ b/source/blender/src/editface.c
@@ -60,7 +60,6 @@
 #include "BKE_displist.h"
 #include "BKE_global.h"
 #include "BKE_mesh.h"
-#include "BKE_multires.h"
 #include "BKE_object.h"
 #include "BKE_texture.h"
 #include "BKE_utildefines.h"
@@ -643,14 +642,8 @@ void default_uv(float uv[][2], float size)
 void make_tfaces(Mesh *me) 
 {
 	if(!me->mtface) {
-		if(me->mr) {
-			multires_add_layer(me, &me->mr->fdata, CD_MTFACE,
-			                   CustomData_number_of_layers(&me->fdata, CD_MTFACE));
-		}
-		else {
-			me->mtface= CustomData_add_layer(&me->fdata, CD_MTFACE, CD_DEFAULT,
-				NULL, me->totface);
-		}
+		me->mtface= CustomData_add_layer(&me->fdata, CD_MTFACE, CD_DEFAULT,
+						 NULL, me->totface);
 	}
 }
 
diff --git a/source/blender/src/editkey.c b/source/blender/src/editkey.c
index 1f24fb07667..d58427f2338 100644
--- a/source/blender/src/editkey.c
+++ b/source/blender/src/editkey.c
@@ -597,27 +597,22 @@ void insert_curvekey(Curve *cu, short rel)
 
 void insert_shapekey(Object *ob)
 {
-	if(get_mesh(ob) && get_mesh(ob)->mr) {
-		error("Cannot create shape keys on a multires mesh.");
-	}
-	else {
-		Key *key;
-	
-		if(ob->type==OB_MESH) insert_meshkey(ob->data, 1);
-		else if ELEM(ob->type, OB_CURVE, OB_SURF) insert_curvekey(ob->data, 1);
-		else if(ob->type==OB_LATTICE) insert_lattkey(ob->data, 1);
-	
-		key= ob_get_key(ob);
-		ob->shapenr= BLI_countlist(&key->block);
-	
-		BIF_undo_push("Add Shapekey");
-		allspace(REMAKEIPO, 0);
-		allqueue(REDRAWIPO, 0);
-		allqueue(REDRAWACTION, 0);
-		allqueue(REDRAWNLA, 0);
-		allqueue(REDRAWBUTSOBJECT, 0);
-		allqueue(REDRAWBUTSEDIT, 0);
-	}
+	Key *key;
+	
+	if(ob->type==OB_MESH) insert_meshkey(ob->data, 1);
+	else if ELEM(ob->type, OB_CURVE, OB_SURF) insert_curvekey(ob->data, 1);
+	else if(ob->type==OB_LATTICE) insert_lattkey(ob->data, 1);
+	
+	key= ob_get_key(ob);
+	ob->shapenr= BLI_countlist(&key->block);
+	
+	BIF_undo_push("Add Shapekey");
+	allspace(REMAKEIPO, 0);
+	allqueue(REDRAWIPO, 0);
+	allqueue(REDRAWACTION, 0);
+	allqueue(REDRAWNLA, 0);
+	allqueue(REDRAWBUTSOBJECT, 0);
+	allqueue(REDRAWBUTSEDIT, 0);
 }
 
 void delete_key(Object *ob)
diff --git a/source/blender/src/editmesh_mods.c b/source/blender/src/editmesh_mods.c
index 25d60c3001b..448a1019d29 100644
--- a/source/blender/src/editmesh_mods.c
+++ b/source/blender/src/editmesh_mods.c
@@ -132,9 +132,7 @@ void EM_select_mirrored(void)
 void EM_automerge(int update) {
 	int len;
 	if ((G.scene->automerge) &&
-		(G.obedit && G.obedit->type==OB_MESH) &&
-		(((Mesh*)G.obedit->data)->mr==NULL)
-	  ) {
+	    (G.obedit && G.obedit->type==OB_MESH)) {
 		len = removedoublesflag(1, 1, G.scene->toolsettings->doublimit);
 		if (len) {
 			G.totvert -= len; /* saves doing a countall */
diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c
index 2f9addb106e..b2b66deeb8a 100644
--- a/source/blender/src/editobject.c
+++ b/source/blender/src/editobject.c
@@ -1799,9 +1799,6 @@ void exit_editmode(int flag)	/* freedata==0 at render, 1= freedata, 2= do undo b
 	/* for example; displist make is different in editmode */
 	if(freedata) G.obedit= NULL;
 
-	if(ob->type==OB_MESH && get_mesh(ob)->mr)
-		multires_edge_level_update(ob, get_mesh(ob));
-	
 	/* also flush ob recalc, doesn't take much overhead, but used for particles */
 	DAG_object_flush_update(G.scene, ob, OB_RECALC_OB|OB_RECALC_DATA);
 
diff --git a/source/blender/src/meshtools.c b/source/blender/src/meshtools.c
index 7e292e10ff8..a716ff7de7c 100644
--- a/source/blender/src/meshtools.c
+++ b/source/blender/src/meshtools.c
@@ -126,7 +126,7 @@ int join_mesh(void)
 	MFace *mface = NULL, *mfacemain;
 	float imat[4][4], cmat[4][4];
 	int a, b, totcol, totedge=0, totvert=0, totface=0, ok=0, vertofs, map[MAXMAT];
-	int i, j, index, haskey=0, hasmulti=0, edgeofs, faceofs;
+	int i, j, index, haskey=0, edgeofs, faceofs;
 	bDeformGroup *dg, *odg;
 	MDeformVert *dvert;
 	CustomData vdata, edata, fdata;
@@ -177,10 +177,6 @@ int join_mesh(void)
 					haskey= 1;
 					break;
 				}
-				if(me->mr) {
-					hasmulti= 1;
-					break;
-				}
 			}
 		}
 		base= base->next;
@@ -190,10 +186,6 @@ int join_mesh(void)
 		error("Can't join meshes with vertex keys");
 		return 0;
 	}
-	if(hasmulti) {
-		error("Can't join meshes with Multires");
-		return 0;
-	}
 	/* that way the active object is always selected */ 
 	if(ok==0) return 0;