Revision: 16093
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16093
Author: nicholasbishop
Date: 2008-08-14 02:05:39 +0200 (Thu, 14 Aug 2008)
Log Message:
-----------
Removed huge tons of old multires stuff.
Modified Paths:
--------------
branches/soc-2008-nicholasbishop/source/blender/src/buttons_editing.c
branches/soc-2008-nicholasbishop/source/blender/src/drawview.c
branches/soc-2008-nicholasbishop/source/blender/src/editdeform.c
branches/soc-2008-nicholasbishop/source/blender/src/editmesh.c
branches/soc-2008-nicholasbishop/source/blender/src/editmesh_add.c
branches/soc-2008-nicholasbishop/source/blender/src/editmesh_mods.c
branches/soc-2008-nicholasbishop/source/blender/src/editmesh_tools.c
branches/soc-2008-nicholasbishop/source/blender/src/editsima.c
branches/soc-2008-nicholasbishop/source/blender/src/header_view3d.c
branches/soc-2008-nicholasbishop/source/blender/src/sculptmode.c
branches/soc-2008-nicholasbishop/source/blender/src/space.c
branches/soc-2008-nicholasbishop/source/blender/src/vpaint.c
Removed Paths:
-------------
branches/soc-2008-nicholasbishop/source/blender/include/multires.h
branches/soc-2008-nicholasbishop/source/blender/src/multires.c
Deleted: branches/soc-2008-nicholasbishop/source/blender/include/multires.h
===================================================================
--- branches/soc-2008-nicholasbishop/source/blender/include/multires.h
2008-08-13 23:53:28 UTC (rev 16092)
+++ branches/soc-2008-nicholasbishop/source/blender/include/multires.h
2008-08-14 00:05:39 UTC (rev 16093)
@@ -1,37 +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 *****
- */
-
-#ifndef MULTIRES_H
-#define MULTIRES_H
-
-/* For canceling operations that don't work with multires on or on a non-base
level */
-int multires_test();
-int multires_level1_test();
-
-#endif
Modified: branches/soc-2008-nicholasbishop/source/blender/src/buttons_editing.c
===================================================================
--- branches/soc-2008-nicholasbishop/source/blender/src/buttons_editing.c
2008-08-13 23:53:28 UTC (rev 16092)
+++ branches/soc-2008-nicholasbishop/source/blender/src/buttons_editing.c
2008-08-14 00:05:39 UTC (rev 16093)
@@ -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 @@
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:
Modified: branches/soc-2008-nicholasbishop/source/blender/src/drawview.c
===================================================================
--- branches/soc-2008-nicholasbishop/source/blender/src/drawview.c
2008-08-13 23:53:28 UTC (rev 16092)
+++ branches/soc-2008-nicholasbishop/source/blender/src/drawview.c
2008-08-14 00:05:39 UTC (rev 16093)
@@ -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
Modified: branches/soc-2008-nicholasbishop/source/blender/src/editdeform.c
===================================================================
--- branches/soc-2008-nicholasbishop/source/blender/src/editdeform.c
2008-08-13 23:53:28 UTC (rev 16092)
+++ branches/soc-2008-nicholasbishop/source/blender/src/editdeform.c
2008-08-14 00:05:39 UTC (rev 16093)
@@ -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 @@
MDeformVert *dvert;
int i, done;
- if(multires_level1_test()) return;
-
ob= G.obedit;
if (!ob)
@@ -833,8 +830,6 @@
bDeformGroup *dg, *eg;
int i;
- if(multires_level1_test()) return;
-
ob= G.obedit;
if (!ob)
@@ -903,8 +898,6 @@
Object *ob;
int actdef, defCount;
- if (multires_level1_test()) return;
-
ob= G.obedit;
if (ob == NULL) return;
Modified: branches/soc-2008-nicholasbishop/source/blender/src/editmesh.c
===================================================================
--- branches/soc-2008-nicholasbishop/source/blender/src/editmesh.c
2008-08-13 23:53:28 UTC (rev 16092)
+++ branches/soc-2008-nicholasbishop/source/blender/src/editmesh.c
2008-08-14 00:05:39 UTC (rev 16093)
@@ -108,7 +108,6 @@
#include "LBM_fluidsim.h"
-#include "multires.h"
#include "mydevice.h"
#include "blendef.h"
@@ -1551,8 +1550,6 @@
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 @@
#endif
TEST_EDITMESH
- if(multires_test()) return;
waitcursor(1);
@@ -1794,7 +1790,6 @@
}
TEST_EDITMESH
- if(multires_test()) return;
waitcursor(1);
/* we are going to abuse the system as follows:
@@ -2001,11 +1996,6 @@
int index;
}EditSelectionC;
-typedef struct EM_MultiresUndo {
- int users;
- Multires *mr;
-} EM_MultiresUndo;
-
typedef struct UndoMesh {
EditVertC *verts;
EditEdgeC *edges;
@@ -2016,7 +2006,6 @@
RetopoPaintData *retopo_paint_data;
char retopo_mode;
CustomData vdata, edata, fdata;
- EM_MultiresUndo *mru;
} UndoMesh;
/* for callbacks */
@@ -2033,14 +2022,6 @@
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 @@
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 @@
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);
- }
}
Modified: branches/soc-2008-nicholasbishop/source/blender/src/editmesh_add.c
===================================================================
--- branches/soc-2008-nicholasbishop/source/blender/src/editmesh_add.c
2008-08-13 23:53:28 UTC (rev 16092)
+++ branches/soc-2008-nicholasbishop/source/blender/src/editmesh_add.c
2008-08-14 00:05:39 UTC (rev 16093)
@@ -84,7 +84,6 @@
#include "BSE_edit.h"
#include "blendef.h"
-#include "multires.h"
#include "mydevice.h"
#include "editmesh.h"
@@ -157,7 +156,6 @@
int done= 0;
TEST_EDITMESH
- if(multires_test()) return;
INIT_MINMAX(min, max);
@@ -658,7 +656,6 @@
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 @@
{
TEST_EDITMESH
- if(multires_test()) return;
waitcursor(1);
@@ -1181,8 +1177,6 @@
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);
Modified: branches/soc-2008-nicholasbishop/source/blender/src/editmesh_mods.c
===================================================================
--- branches/soc-2008-nicholasbishop/source/blender/src/editmesh_mods.c
2008-08-13 23:53:28 UTC (rev 16092)
+++ branches/soc-2008-nicholasbishop/source/blender/src/editmesh_mods.c
2008-08-14 00:05:39 UTC (rev 16093)
@@ -103,7 +103,6 @@
#include "RE_render_ext.h" /* externtex */
-#include "multires.h"
#include "mydevice.h"
#include "blendef.h"
@@ -3531,8 +3530,6 @@
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 @@
}
#endif
- if(multires_level1_test()) return;
-
if(set) {
eed= em->edges.first;
while(eed) {
Modified: branches/soc-2008-nicholasbishop/source/blender/src/editmesh_tools.c
===================================================================
--- branches/soc-2008-nicholasbishop/source/blender/src/editmesh_tools.c
2008-08-13 23:53:28 UTC (rev 16092)
+++ branches/soc-2008-nicholasbishop/source/blender/src/editmesh_tools.c
2008-08-14 00:05:39 UTC (rev 16093)
@@ -101,7 +101,6 @@
#include "BSE_edit.h"
#include "blendef.h"
-#include "multires.h"
#include "mydevice.h"
#include "editmesh.h"
@@ -155,8 +154,6 @@
EditFace *efa, *efan, *next;
float fac;
- if(multires_test()) return;
-
efa= em->faces.last;
while(efa) {
next= efa->prev;
@@ -213,9 +210,6 @@
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 @@
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 @@
ListBase tbase;
int amount, a, b;
- if(multires_test()) return;
-
/* count */
eve= em->verts.first;
amount= 0;
@@ -628,7 +618,6 @@
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 split_mesh(void)
{
-
TEST_EDITMESH
- if(multires_test()) return;
if(okee(" Split ")==0) return;
@@ -736,7 +723,6 @@
short a;
TEST_EDITMESH
- if(multires_test()) return;
/* dvec */
dvec[0]= G.vd->persinv[2][0];
@@ -779,7 +765,6 @@
short a,ok;
TEST_EDITMESH
- if(multires_test()) return;
/* imat and center and size */
Mat3CpyMat4(bmat, G.obedit->obmat);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
