Remove vestigial retopo/retopo-paint code.
authorNicholas Bishop <nicholasbishop@gmail.com>
Thu, 12 Jan 2012 22:12:07 +0000 (22:12 +0000)
committerNicholas Bishop <nicholasbishop@gmail.com>
Thu, 12 Jan 2012 22:12:07 +0000 (22:12 +0000)
source/blender/blenlib/BLI_editVert.h
source/blender/editors/curve/editcurve.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/object/object_edit.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/makesdna/DNA_scene_types.h

index ad36f86ea0feba114800a883166a93b6ac212816..0ddea230b840cff4702ece338ede212929582905 100644 (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;
index aea6f5c43b6e0630d3c49ece88eea32bb7cd821f..a659e8b7f56d218c6f316fc36cd6c534dcd8033b 100644 (file)
@@ -4607,8 +4607,6 @@ static int addvert_Nurb(bContext *C, short mode, float location[3])
                }
        }
 
-       // XXX retopo_do_all();
-
        if(ok) {
                test2DNurb(nu);
 
index f617971967cf89e2c1aefe0434465be914eeafbd..6ebee796f0aaf931eaaa90f2d84a351df135ff2a 100644 (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)
index e9bff9b644d6da423cd0edc1e076cc3cb0a0bd69..61ba54e7d36f8d7199de45ba8f1f4ca6585b1623 100644 (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;
index 3a0202ad54666c9a3f2b9baba89fb0ef92b83a06..25b8b8415d9b47f2582bc59c0ea6d812bede7897 100644 (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;
 }
 
index 1f578455d1000a7980beff11711b36aa8b87d947..6044e96cec42dbeeda49ad8963f936224e19adcb 100644 (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);
index cac5d856652367aeb03338e47b172f3437378440..196af34137a8d7e1b40f620eb26b01c2b0b4e70b 100644 (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);
                }
index 743458f62c8e1364224fab9f6034e72e6cc7b3a4..505a9ee30abfb121be3388ccfa8963eeb1478ea7 100644 (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)