Removed huge tons of old multires stuff.

13 files changed, 14 insertions, 238 deletions

diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 0a33c1a0d9c..3cee42e97a9 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -178,7 +178,6 @@
 #include "RE_render_ext.h"		// make_sticky
 
 #include "butspace.h" // own module
-#include "multires.h"
 
 static float editbutweight= 1.0;
 float editbutvweight= 1;
@@ -5843,16 +5842,14 @@ void do_fpaintbuts(unsigned short event)
 		allqueue(REDRAWBUTSEDIT, 0);
 		break;
 	case B_CLR_WPAINT:
-		if(!multires_level1_test()) {
-			defGroup = BLI_findlink(&ob->defbase, ob->actdef-1);
-			if(defGroup) {
-				Mesh *me= ob->data;
-				int a;
-				for(a=0; a<me->totvert; a++)
-					remove_vert_defgroup (ob, defGroup, a);
-				allqueue(REDRAWVIEW3D, 0);
-				DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
-			}
+		defGroup = BLI_findlink(&ob->defbase, ob->actdef-1);
+		if(defGroup) {
+			Mesh *me= ob->data;
+			int a;
+			for(a=0; a<me->totvert; a++)
+				remove_vert_defgroup (ob, defGroup, a);
+			allqueue(REDRAWVIEW3D, 0);
+			DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
 		}
 		break;
 	case B_SCULPT_TEXBROWSE:
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c
index 2030eb658de..06f5282fac2 100644
--- a/source/blender/src/drawview.c
+++ b/source/blender/src/drawview.c
@@ -162,8 +162,6 @@
 
 #include "RE_pipeline.h"	// make_stars
 
-#include "multires.h"
-
 /* For MULTISAMPLE_ARB #define.
    Note that older systems like irix 
    may not have this, and will need a #ifdef
diff --git a/source/blender/src/editdeform.c b/source/blender/src/editdeform.c
index 5de4c6ed23c..8d7ca554d01 100644
--- a/source/blender/src/editdeform.c
+++ b/source/blender/src/editdeform.c
@@ -67,7 +67,6 @@
 #include "butspace.h"
 #include "mydevice.h"
 #include "editmesh.h"
-#include "multires.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -673,8 +672,6 @@ void assign_verts_defgroup (void)
 	MDeformVert *dvert;
 	int	i, done;
 	
-	if(multires_level1_test()) return;
-
 	ob= G.obedit;
 
 	if (!ob)
@@ -833,8 +830,6 @@ void remove_verts_defgroup (int allverts)
 	bDeformGroup *dg, *eg;
 	int	i;
 	
-	if(multires_level1_test()) return;
-
 	ob= G.obedit;
 
 	if (!ob)
@@ -903,8 +898,6 @@ void remove_verts_defgroups(int allverts)
 	Object *ob;
 	int actdef, defCount;
 	
-	if (multires_level1_test()) return;
-
 	ob= G.obedit;
 	if (ob == NULL) return;
 	
diff --git a/source/blender/src/editmesh.c b/source/blender/src/editmesh.c
index 79cb03f9f8e..6503b1c0a85 100644
--- a/source/blender/src/editmesh.c
+++ b/source/blender/src/editmesh.c
@@ -108,7 +108,6 @@
 
 #include "LBM_fluidsim.h"
 
-#include "multires.h"
 #include "mydevice.h"
 #include "blendef.h"
 
@@ -1551,8 +1550,6 @@ void separate_material(void)
 	unsigned char curr_mat;
 	Mesh *me;
 	
-	if(multires_test()) return;
-	
 	me= get_mesh(G.obedit);
 	if(me->key) {
 		error("Can't separate with vertex keys");
@@ -1594,7 +1591,6 @@ void separate_mesh(void)
 #endif
 	
 	TEST_EDITMESH
-	if(multires_test()) return;
 
 	waitcursor(1);
 	
@@ -1794,7 +1790,6 @@ void separate_mesh_loose(void)
 	}
 
 	TEST_EDITMESH
-	if(multires_test()) return;
 	waitcursor(1);	
 	
 	/* we are going to abuse the system as follows:
@@ -2001,11 +1996,6 @@ typedef struct EditSelectionC{
 	int index;
 }EditSelectionC;
 
-typedef struct EM_MultiresUndo {
-	int users;
-	Multires *mr;
-} EM_MultiresUndo;
-
 typedef struct UndoMesh {
 	EditVertC *verts;
 	EditEdgeC *edges;
@@ -2016,7 +2006,6 @@ typedef struct UndoMesh {
 	RetopoPaintData *retopo_paint_data;
 	char retopo_mode;
 	CustomData vdata, edata, fdata;
-	EM_MultiresUndo *mru;
 } UndoMesh;
 
 /* for callbacks */
@@ -2033,14 +2022,6 @@ static void free_undoMesh(void *umv)
 	CustomData_free(&um->vdata, um->totvert);
 	CustomData_free(&um->edata, um->totedge);
 	CustomData_free(&um->fdata, um->totface);
-	if(um->mru) {
-		--um->mru->users;
-		if(um->mru->users==0) {
-			multires_free(um->mru->mr);
-			um->mru->mr= NULL;
-			MEM_freeN(um->mru);
-		}
-	}
 	MEM_freeN(um);
 }
 
@@ -2140,25 +2121,6 @@ static void *editMesh_to_undoMesh(void)
 	um->retopo_paint_data= retopo_paint_data_copy(em->retopo_paint_data);
 	um->retopo_mode= G.scene->toolsettings->retopo_mode;
 	
-	{
-		Multires *mr= get_mesh(G.obedit)->mr;
-		UndoMesh *prev= undo_editmode_get_prev(G.obedit);
-		
-		um->mru= NULL;
-		
-		if(mr) {
-			if(prev && prev->mru && prev->mru->mr && prev->mru->mr->current == mr->current) {
-				um->mru= prev->mru;
-				++um->mru->users;
-			}
-			else {
-				um->mru= MEM_callocN(sizeof(EM_MultiresUndo), "EM_MultiresUndo");
-				um->mru->users= 1;
-				um->mru->mr= multires_copy(mr);
-			}
-		}
-	}
-	
 	return um;
 }
 
@@ -2279,13 +2241,6 @@ static void undoMesh_to_editMesh(void *umv)
 		retopo_queue_updates(G.vd);
 		retopo_paint_view_update(G.vd);
 	}
-	
-	{
-		Mesh *me= get_mesh(G.obedit);
-		multires_free(me->mr);
-		me->mr= NULL;
-		if(um->mru && um->mru->mr) me->mr= multires_copy(um->mru->mr);
-	}
 }
 
 
diff --git a/source/blender/src/editmesh_add.c b/source/blender/src/editmesh_add.c
index 9516f39b05c..2abdfa02d2e 100644
--- a/source/blender/src/editmesh_add.c
+++ b/source/blender/src/editmesh_add.c
@@ -84,7 +84,6 @@
 #include "BSE_edit.h"
 
 #include "blendef.h"
-#include "multires.h"
 #include "mydevice.h"
 
 #include "editmesh.h"
@@ -157,7 +156,6 @@ void add_click_mesh(void)
 	int done= 0;
 	
 	TEST_EDITMESH
-	if(multires_test()) return;
 	
 	INIT_MINMAX(min, max);
 	
@@ -658,7 +656,6 @@ void addedgeface_mesh(void)
 	short amount=0;
 
 	if( (G.vd->lay & G.obedit->lay)==0 ) return;
-	if(multires_test()) return;
 
 	/* how many selected ? */
 	if(G.scene->selectmode & SCE_SELECT_EDGE) {
@@ -813,7 +810,6 @@ void adduplicate_mesh(void)
 {
 
 	TEST_EDITMESH
-	if(multires_test()) return;
 
 	waitcursor(1);
 
@@ -1181,8 +1177,6 @@ void add_primitiveMesh(int type)
 	if ELEM(curarea->spacetype, SPACE_VIEW3D, SPACE_INFO); else return;
 	if(G.vd==0) return;
 
-	if (G.obedit && G.obedit->type==OB_MESH && multires_test()) return;
-	
 	/* if editmode exists for other type, it exits */
 	check_editmode(OB_MESH);
 	
diff --git a/source/blender/src/editmesh_mods.c b/source/blender/src/editmesh_mods.c
index c7a75b32df1..25d60c3001b 100644
--- a/source/blender/src/editmesh_mods.c
+++ b/source/blender/src/editmesh_mods.c
@@ -103,7 +103,6 @@ editmesh_mods.c, UI level access, no geometry changes
 
 #include "RE_render_ext.h"  /* externtex */
 
-#include "multires.h"
 #include "mydevice.h"
 #include "blendef.h"
 
@@ -3531,8 +3530,6 @@ void editmesh_mark_seam(int clear)
 	EditMesh *em= G.editMesh;
 	EditEdge *eed;
 	
-	if(multires_level1_test()) return;
-
 	/* auto-enable seams drawing */
 	if(clear==0) {
 		if(!(G.f & G_DRAWSEAMS)) {
@@ -3580,8 +3577,6 @@ void editmesh_mark_sharp(int set)
 	}
 #endif
 
-	if(multires_level1_test()) return;
-
 	if(set) {
 		eed= em->edges.first;
 		while(eed) {
diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c
index f9bb14a08c6..d5d2dc8d9ef 100644
--- a/source/blender/src/editmesh_tools.c
+++ b/source/blender/src/editmesh_tools.c
@@ -101,7 +101,6 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise
 #include "BSE_edit.h"
 
 #include "blendef.h"
-#include "multires.h"
 #include "mydevice.h"
 
 #include "editmesh.h"
@@ -155,8 +154,6 @@ void convert_to_triface(int direction)
 	EditFace *efa, *efan, *next;
 	float fac;
 	
-	if(multires_test()) return;
-	
 	efa= em->faces.last;
 	while(efa) {
 		next= efa->prev;
@@ -213,9 +210,6 @@ int removedoublesflag(short flag, short automerge, float limit)		/* return amoun
 	struct facesort *vlsortblock, *vsb, *vsb1;
 	int a, b, test, amount;
 	
-	if(multires_test()) return 0;
-
-	
 	/* flag 128 is cleared, count */
 
 	/* Normal non weld operation */
@@ -522,8 +516,6 @@ void xsortvert_flag(int flag)
 	ListBase tbase;
 	int i, amount = BLI_countlist(&em->verts);
 	
-	if(multires_test()) return;
-	
 	sortblock = MEM_callocN(sizeof(xvertsort)*amount,"xsort");
 	for (i=0,eve=em->verts.first; eve; i++,eve=eve->next)
 		if(eve->f & flag)
@@ -565,8 +557,6 @@ void hashvert_flag(int flag)
 	ListBase tbase;
 	int amount, a, b;
 	
-	if(multires_test()) return;
-	
 	/* count */
 	eve= em->verts.first;
 	amount= 0;
@@ -628,7 +618,6 @@ void extrude_mesh(void)
 	short nr, transmode= 0;
 
 	TEST_EDITMESH
-	if(multires_test()) return;
 	
 	if(G.scene->selectmode & SCE_SELECT_VERTEX) {
 		if(G.totvertsel==0) nr= 0;
@@ -701,9 +690,7 @@ void extrude_mesh(void)
 
 void split_mesh(void)
 {
-
 	TEST_EDITMESH
-	if(multires_test()) return;
 
 	if(okee(" Split ")==0) return;
 
@@ -736,7 +723,6 @@ void extrude_repeat_mesh(int steps, float offs)
 	short a;
 
 	TEST_EDITMESH
-	if(multires_test()) return;
 	
 	/* dvec */
 	dvec[0]= G.vd->persinv[2][0];
@@ -779,7 +765,6 @@ void spin_mesh(int steps, float degr, float *dvec, int mode)
 	short a,ok;
 
 	TEST_EDITMESH
-	if(multires_test()) return;
 	
 	/* imat and center and size */
 	Mat3CpyMat4(bmat, G.obedit->obmat);
@@ -865,7 +850,6 @@ void screw_mesh(int steps, int turns)
 	float dvec[3], nor[3];
 
 	TEST_EDITMESH
-	if(multires_test()) return;
 	
 	/* clear flags */
 	eve= em->verts.first;
@@ -979,7 +963,6 @@ void delete_mesh(void)
 	char *str="Erase";
 
 	TEST_EDITMESH
-	if(multires_test()) return;
 	
 	event= pupmenu("Erase %t|Vertices%x10|Edges%x1|Faces%x2|All%x3|Edges & Faces%x4|Only Faces%x5|Edge Loop%x6");
 	if(event<1) return;
@@ -1127,7 +1110,6 @@ void fill_mesh(void)
 	short ok;
 
 	if(G.obedit==0 || (G.obedit->type!=OB_MESH)) return;
-	if(multires_test()) return;
 
 	waitcursor(1);
 
@@ -2427,8 +2409,6 @@ void esubdivideflag(int flag, float rad, int beauty, int numcuts, int seltype)
 	int i, j, edgecount, touchcount, facetype,hold;
 	ModifierData *md= G.obedit->modifiers.first;
 	
-	if(multires_test()) return;
-
 	//Set faces f1 to 0 cause we need it later
 	for(ef=em->faces.first;ef;ef = ef->next) ef->f1 = 0;
 	for(eve=em->verts.first; eve; eve=eve->next) eve->f1 = eve->f2 = 0;
@@ -2980,8 +2960,6 @@ void beauty_fill(void)
 	float len1, len2, len3, len4, len5, len6, opp1, opp2, fac1, fac2;
 	int totedge, ok, notbeauty=8, onedone, vindex[4];
 	
-	if(multires_test()) return;
-
 	/* - all selected edges with two faces
 		* - find the faces: store them in edges (using datablock)
 		* - per edge: - test convex
@@ -3292,9 +3270,6 @@ void join_triangles(void)
 	float limit = G.scene->toolsettings->jointrilimit;
 	int i, ok, totedge=0, totseledge=0, complexedges, vindex[4];
 	
-	/*test for multi-resolution data*/
-	if(multires_test()) return;
-
 	/*if we take a long time on very dense meshes we want waitcursor to display*/
 	waitcursor(1);
 	
@@ -4100,8 +4075,6 @@ static void bevel_mesh(float bsize, int allfaces)
 	int a, b, c;
 	float limit= 0.001f;
 	
-	if(multires_test()) return;
-
 	waitcursor(1);
 
 	removedoublesflag(1, 0, limit);
@@ -6197,8 +6170,6 @@ int collapseEdges(void)
 	
 	mergecount = 0;
 	
-	if(multires_test()) return 0;
-	
 	build_edgecollection(&allcollections);
 	groupcount = BLI_countlist(&allcollections);
 	
@@ -6258,8 +6229,6 @@ int merge_firstlast(int first, int uvmerge)
 	EditVert *eve,*mergevert;
 	EditSelection *ese;
 	
-	if(multires_test()) return 0;
-	
 	/* do sanity check in mergemenu in edit.c ?*/
 	if(first == 0){ 
 		ese = G.editMesh->selected.last;
@@ -6294,8 +6263,6 @@ int merge_target(int target, int uvmerge)
 {
 	EditVert *eve;
 	
-	if(multires_test()) return 0;
-	
 	if(target) snap_sel_to_curs();
 	else snap_to_center();
 	
diff --git a/source/blender/src/editsima.c b/source/blender/src/editsima.c
index 69070d61bf0..7c22d22ac5a 100644
--- a/source/blender/src/editsima.c
+++ b/source/blender/src/editsima.c
@@ -105,7 +105,6 @@
 #include "RE_pipeline.h"
 
 #include "blendef.h"
-#include "multires.h"
 #include "mydevice.h"
 #include "editmesh.h"
 
@@ -132,7 +131,6 @@ int is_uv_tface_editing_allowed_silent(void)
 {
 	if(!EM_texFaceCheck()) return 0;
 	if(G.sima->mode!=SI_TEXTURE) return 0;
-	if(multires_level1_test()) return 0;	
 	return 1;
 }
 
diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c
index 71bf0cd9bd4..2b8da83dc1d 100644
--- a/source/blender/src/header_view3d.c
+++ b/source/blender/src/header_view3d.c
@@ -128,7 +128,6 @@
 #include "BPY_menus.h"
 
 #include "blendef.h"
-#include "multires.h"
 #include "mydevice.h"
 #include "butspace.h"
 
@@ -2708,10 +2707,8 @@ void do_view3d_edit_mesh_edgesmenu(void *arg, int event)
 		editmesh_mark_seam(1);
 		break;
 	case 9: /* Crease SubSurf */
-		if(!multires_level1_test()) {
-			initTransform(TFM_CREASE, CTX_EDGE);
-			Transform();
-		}
+		initTransform(TFM_CREASE, CTX_EDGE);
+		Transform();
 		break;
 	case 10: /* Rotate Edge */
 		edge_rotate_selected(2);
@@ -2744,10 +2741,8 @@ void do_view3d_edit_mesh_edgesmenu(void *arg, int event)
 		DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);
 		break;
 	case 17: /* Adjust Bevel Weight */
-		if(!multires_level1_test()) {
-			initTransform(TFM_BWEIGHT, CTX_EDGE);
-			Transform();
-		}
+		initTransform(TFM_BWEIGHT, CTX_EDGE);
+		Transform();
 		break;
 	}
 	allqueue(REDRAWVIEW3D, 0);
diff --git a/source/blender/src/multires.c b/source/blender/src/multires.c
deleted file mode 100644
index cf811fde300..00000000000
--- a/source/blender/src/multires.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software  Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2006 by Nicholas Bishop
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- *
- * Implements the multiresolution modeling tools.
- *
- * multires.h
- *
- */
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_arithb.h"
-
-#include "DNA_key_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_vec_types.h"
-#include "DNA_view3d_types.h"
-
-#include "BKE_customdata.h"
-#include "BKE_depsgraph.h"
-#include "BKE_global.h"
-#include "BKE_key.h"
-#include "BKE_mesh.h"
-#include "BKE_modifier.h"
-#include "BKE_multires.h"
-#include "BKE_object.h"
-
-#include "BIF_editmesh.h"
-#include "BIF_screen.h"
-#include "BIF_space.h"
-#include "BIF_toolbox.h"
-
-#include "BDR_editobject.h"
-#include "BDR_sculptmode.h"
-
-#include "BLI_editVert.h"
-
-#include "BSE_edit.h"
-#include "BSE_view.h"
-
-#include "IMB_imbuf.h"
-#include "IMB_imbuf_types.h"
-
-#include "blendef.h"
-#include "editmesh.h"
-#include "multires.h"
-#include "mydevice.h"
-#include "parametrizer.h"
-
-#include <math.h>
-
-int multires_test()
-{
-	Mesh *me= get_mesh(OBACT);
-	if(me && me->mr) {
-		error("Unable to complete action with multires enabled.");
-		return 1;
-	}
-	return 0;
-}
-int multires_level1_test()
-{
-	Mesh *me= get_mesh(OBACT);
-	if(me && me->mr && me->mr->current != 1) {
-		error("Operation only available for multires level 1.");
-		return 1;
-	}
-	return 0;
-}
-
-/* Sculptmode */
-
-void multires_check_state()
-{
-	if(G.f & G_SCULPTMODE && !G.obedit)
-		sculptmode_correct_state();
-}
diff --git a/source/blender/src/sculptmode.c b/source/blender/src/sculptmode.c
index e2f220ab6d2..1df231c53bb 100644
--- a/source/blender/src/sculptmode.c
+++ b/source/blender/src/sculptmode.c
@@ -93,7 +93,6 @@
 #include "IMB_imbuf_types.h"
 
 #include "blendef.h"
-#include "multires.h"
 #include "mydevice.h"
 
 #include "RE_render_ext.h"
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 32ae77ac5fa..400509012c6 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -172,7 +172,6 @@
 #include "mydevice.h"
 #include "blendef.h"
 #include "datatoc.h"
-#include "multires.h"
 
 #include "BIF_transform.h"
 
@@ -1980,8 +1979,7 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 						seam_mark_clear_tface(0);
 				}
 				else if (G.qual==LR_SHIFTKEY) {
-					if (G.obedit && G.obedit->type==OB_MESH &&
-					    !multires_level1_test()) {
+					if (G.obedit && G.obedit->type==OB_MESH) {
 						initTransform(TFM_CREASE, CTX_EDGE);
 						Transform();
 					}
@@ -1990,8 +1988,7 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					}
 				}
 				else if (G.qual == (LR_CTRLKEY|LR_SHIFTKEY)) {
-					if (G.obedit && G.obedit->type==OB_MESH &&
-					    !multires_level1_test()) {
+					if (G.obedit && G.obedit->type==OB_MESH) {
 						if (G.scene->selectmode & SCE_SELECT_VERTEX) {
 							initTransform(TFM_BWEIGHT, CTX_NONE);
 						}
diff --git a/source/blender/src/vpaint.c b/source/blender/src/vpaint.c
index 935c546a235..aa153ad4247 100644
--- a/source/blender/src/vpaint.c
+++ b/source/blender/src/vpaint.c
@@ -71,7 +71,6 @@
 #include "BKE_global.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_multires.h"
 #include "BKE_object.h"
 #include "BKE_utildefines.h"
 
@@ -93,7 +92,6 @@
 #include "BSE_trans_types.h"
 #include "BSE_view.h"
 
-#include "multires.h"
 #include "mydevice.h"
 #include "blendef.h"
 
@@ -252,8 +250,6 @@ void make_vertexcol(int shade)	/* single ob */
 	else
 		memset(me->mcol, 255, 4*sizeof(MCol)*me->totface);
 	
-	if (me->mr) multires_load_cols(me);
-	
 	DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
 	
 	allqueue(REDRAWBUTSEDIT, 0);
@@ -1094,7 +1090,6 @@ void weight_paint(void)
 
 	if((G.f & G_WEIGHTPAINT)==0) return;
 	if(G.obedit) return;
-	if(multires_level1_test()) return;
 	
 	ob= OBACT;
 	if(!ob || ob->id.lib) return;