bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Remove vestigial retopo/retopo-paint code.

Browse Source
This commit is contained in:
Nicholas Bishop 2012-01-12 22:12:07 +00:00
parent b2ae44dc41
commit dbdd1c2ea7
8 changed files with 1 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenlib/BLI_editVert.h
View File

@ -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 @@ typedef struct EditMesh
*/
int lastDataMask;
struct RetopoPaintData *retopo_paint_data;
CustomData vdata, edata, fdata;
} EditMesh;

2
source/blender/editors/curve/editcurve.c
View File

@ -4607,8 +4607,6 @@ static int addvert_Nurb(bContext *C, short mode, float location[3])
}
}
// XXX retopo_do_all();
if(ok) {
test2DNurb(nu);

17
source/blender/editors/mesh/editmesh.c
View File

@ -564,8 +564,6 @@ void free_editMesh(EditMesh *em)
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 @@ typedef struct UndoMesh {
EditSelectionC *selected;
int totvert, totedge, totface, totsel;
int selectmode, shapenr;
char retopo_mode;
CustomData vdata, edata, fdata;
} UndoMesh;
@ -1643,7 +1640,6 @@ static void free_undoMesh(void *umv)
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 @@ static void *editMesh_to_undoMesh(void *emv)
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 @@ static void undoMesh_to_editMesh(void *umv, void *emv)
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)

3
source/blender/editors/object/object_edit.c
View File

@ -321,9 +321,6 @@ void ED_object_exit_editmode(bContext *C, int flag)
// if(EM_texFaceCheck())
// if(retopo_mesh_paint_check())
// retopo_end_okee();
if(me->edit_mesh->totvert>MESH_MAX_VERTS) {
error("Too many vertices");
return;

2
source/blender/editors/screen/screen_edit.c
View File

@ -1689,8 +1689,6 @@ ScrArea *ED_screen_full_toggle(bContext *C, wmWindow *win, ScrArea *sa)
/* 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;
}

4
source/blender/editors/space_view3d/drawobject.c
View File

@ -3000,8 +3000,6 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d,
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 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
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);

1
source/blender/editors/space_view3d/space_view3d.c
View File

@ -553,7 +553,6 @@ static void view3d_main_area_free(ARegion *ar)
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);
}

15
source/blender/makesdna/DNA_scene_types.h
View File

@ -920,13 +920,9 @@ typedef struct ToolSettings {
/* 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 @@ typedef enum SculptFlags {
#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)