[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43338] trunk/blender/source/blender: Remove vestigial retopo/retopo-paint code.
Nicholas Bishop
nicholasbishop at gmail.com
Thu Jan 12 23:12:17 CET 2012
Revision: 43338
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43338
Author: nicholasbishop
Date: 2012-01-12 22:12:07 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
Remove vestigial retopo/retopo-paint code.
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/BLI_editVert.h
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/mesh/editmesh.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/screen/screen_edit.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/space_view3d.c
trunk/blender/source/blender/makesdna/DNA_scene_types.h
Modified: trunk/blender/source/blender/blenlib/BLI_editVert.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_editVert.h 2012-01-12 21:48:08 UTC (rev 43337)
+++ trunk/blender/source/blender/blenlib/BLI_editVert.h 2012-01-12 22:12:07 UTC (rev 43338)
@@ -42,7 +42,6 @@
#include "BLO_sys_types.h" // for intptr_t support
struct DerivedMesh;
-struct RetopoPaintData;
/* note; changing this also might affect the undo copy in editmesh.c */
typedef struct EditVert
@@ -184,8 +183,6 @@
*/
int lastDataMask;
- struct RetopoPaintData *retopo_paint_data;
-
CustomData vdata, edata, fdata;
} EditMesh;
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2012-01-12 21:48:08 UTC (rev 43337)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2012-01-12 22:12:07 UTC (rev 43338)
@@ -4607,8 +4607,6 @@
}
}
- // XXX retopo_do_all();
-
if(ok) {
test2DNurb(nu);
Modified: trunk/blender/source/blender/editors/mesh/editmesh.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh.c 2012-01-12 21:48:08 UTC (rev 43337)
+++ trunk/blender/source/blender/editors/mesh/editmesh.c 2012-01-12 22:12:07 UTC (rev 43338)
@@ -564,8 +564,6 @@
em->totvert= em->totedge= em->totface= 0;
-// XXX if(em->retopo_paint_data) retopo_free_paint_data(em->retopo_paint_data);
- em->retopo_paint_data= NULL;
em->act_face = NULL;
}
@@ -1629,7 +1627,6 @@
EditSelectionC *selected;
int totvert, totedge, totface, totsel;
int selectmode, shapenr;
- char retopo_mode;
CustomData vdata, edata, fdata;
} UndoMesh;
@@ -1643,7 +1640,6 @@
if(um->edges) MEM_freeN(um->edges);
if(um->faces) MEM_freeN(um->faces);
if(um->selected) MEM_freeN(um->selected);
-// XXX if(um->retopo_paint_data) retopo_free_paint_data(um->retopo_paint_data);
CustomData_free(&um->vdata, um->totvert);
CustomData_free(&um->edata, um->totedge);
CustomData_free(&um->fdata, um->totface);
@@ -1744,9 +1740,6 @@
else if(ese->type == EDITFACE) a = esec->index = ((EditFace*)ese->data)->tmp.l;
}
-// XXX um->retopo_paint_data= retopo_paint_data_copy(em->retopo_paint_data);
-// um->retopo_mode= scene->toolsettings->retopo_mode;
-
return um;
}
@@ -1852,16 +1845,6 @@
EM_nvertices_selected(em);
EM_nedges_selected(em);
EM_nfaces_selected(em);
-
-// XXX retopo_free_paint();
-// em->retopo_paint_data= retopo_paint_data_copy(um->retopo_paint_data);
-// scene->toolsettings->retopo_mode= um->retopo_mode;
-// if(scene->toolsettings->retopo_mode) {
-// XXX if(G.vd->depths) G.vd->depths->damaged= 1;
-// retopo_queue_updates(G.vd);
-// retopo_paint_view_update(G.vd);
-// }
-
}
static void *getEditMesh(bContext *C)
Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c 2012-01-12 21:48:08 UTC (rev 43337)
+++ trunk/blender/source/blender/editors/object/object_edit.c 2012-01-12 22:12:07 UTC (rev 43338)
@@ -321,9 +321,6 @@
// if(EM_texFaceCheck())
-// if(retopo_mesh_paint_check())
-// retopo_end_okee();
-
if(me->edit_mesh->totvert>MESH_MAX_VERTS) {
error("Too many vertices");
return;
Modified: trunk/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_edit.c 2012-01-12 21:48:08 UTC (rev 43337)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c 2012-01-12 22:12:07 UTC (rev 43338)
@@ -1689,8 +1689,6 @@
/* XXX bad code: setscreen() ends with first area active. fullscreen render assumes this too */
CTX_wm_area_set(C, sc->areabase.first);
- /* XXX retopo_force_update(); */
-
return sc->areabase.first;
}
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c 2012-01-12 21:48:08 UTC (rev 43337)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c 2012-01-12 22:12:07 UTC (rev 43338)
@@ -3000,8 +3000,6 @@
draw_em_fancy_edges(scene, v3d, me, cageDM, 0, eed_act);
}
if(em) {
-// XXX retopo_matrix_update(v3d);
-
draw_em_fancy_verts(scene, v3d, ob, cageDM, eve_act);
if(me->drawflag & ME_DRAWNORMALS) {
@@ -5327,8 +5325,6 @@
short hide_handles = (cu->drawflag & CU_HIDE_HANDLES);
int index;
-// XXX retopo_matrix_update(v3d);
-
/* DispList */
UI_ThemeColor(TH_WIRE);
drawDispList(scene, v3d, rv3d, base, dt);
Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c 2012-01-12 21:48:08 UTC (rev 43337)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c 2012-01-12 22:12:07 UTC (rev 43338)
@@ -553,7 +553,6 @@
if(rv3d->localvd) MEM_freeN(rv3d->localvd);
if(rv3d->clipbb) MEM_freeN(rv3d->clipbb);
- // XXX retopo_free_view_data(rv3d);
if(rv3d->ri) {
// XXX BIF_view3d_previewrender_free(rv3d);
}
Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h 2012-01-12 21:48:08 UTC (rev 43337)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h 2012-01-12 22:12:07 UTC (rev 43338)
@@ -920,13 +920,9 @@
/* Auto-Keying Mode */
short autokey_mode, autokey_flag; /* defines in DNA_userdef_types.h */
- /* Retopo */
- char retopo_mode;
- char retopo_paint_tool;
- char line_div, ellipse_div, retopo_hotspot;
-
/* Multires */
char multires_subdiv_type;
+ char pad2[5];
/* Skeleton generation */
short skgen_resolution;
@@ -1476,15 +1472,6 @@
#define PE_TYPE_SOFTBODY 1
#define PE_TYPE_CLOTH 2
-/* toolsettings->retopo_mode */
-#define RETOPO 1
-#define RETOPO_PAINT 2
-
-/* toolsettings->retopo_paint_tool */ /*UNUSED*/
-/* #define RETOPO_PEN 1 */
-/* #define RETOPO_LINE 2 */
-/* #define RETOPO_ELLIPSE 4 */
-
/* toolsettings->skgen_options */
#define SKGEN_FILTER_INTERNAL (1 << 0)
#define SKGEN_FILTER_EXTERNAL (1 << 1)
More information about the Bf-blender-cvs
mailing list