remove ED_retopo.h
authorCampbell Barton <ideasman42@gmail.com>
Wed, 5 Jan 2011 15:37:36 +0000 (15:37 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 5 Jan 2011 15:37:36 +0000 (15:37 +0000)
source/blender/editors/include/ED_retopo.h [deleted file]
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/util/CMakeLists.txt

diff --git a/source/blender/editors/include/ED_retopo.h b/source/blender/editors/include/ED_retopo.h
deleted file mode 100644 (file)
index e8d7441..0000000
+++ /dev/null
@@ -1,111 +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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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 ED_RETOPO_H
-#define ED_RETOPO_H
-
-#include "DNA_vec_types.h"
-
-/* For bglMats */
-#include "BIF_glutil.h"
-
-struct EditVert;
-struct Mesh;
-struct View3D;
-
-typedef struct RetopoViewData {
-       bglMats mats;
-
-       char queue_matrix_update;
-} RetopoViewData;
-
-typedef struct RetopoPaintPoint {
-       struct RetopoPaintPoint *next, *prev;
-       vec2s loc;
-       short index;
-       float co[3];
-       struct EditVert *eve;
-} RetopoPaintPoint;
-
-typedef struct RetopoPaintLine {
-       struct RetopoPaintLine *next, *prev;
-       ListBase points;
-       ListBase hitlist; /* RetopoPaintHit */
-       RetopoPaintPoint *cyclic;
-} RetopoPaintLine;
-
-typedef struct RetopoPaintSel {
-       struct RetopoPaintSel *next, *prev;
-       RetopoPaintLine *line;
-       char first;
-} RetopoPaintSel;
-
-typedef struct RetopoPaintData {
-       char in_drag;
-       short sloc[2];
-
-       ListBase lines;
-       ListBase intersections; /* RetopoPaintPoint */
-
-       short seldist;
-       RetopoPaintSel nearest;
-       
-       struct View3D *paint_v3d;
-} RetopoPaintData;
-
-RetopoPaintData *get_retopo_paint_data(void);
-
-char retopo_mesh_check(void);
-char retopo_curve_check(void);
-
-void retopo_end_okee(void);
-
-void retopo_free_paint_data(RetopoPaintData *rpd);
-void retopo_free_paint(void);
-
-char retopo_mesh_paint_check(void);
-void retopo_paint_view_update(struct View3D *v3d);
-void retopo_force_update(void);
-void retopo_paint_toggle(void*,void*);
-char retopo_paint(const unsigned short event);
-void retopo_draw_paint_lines(void);
-RetopoPaintData *retopo_paint_data_copy(RetopoPaintData *rpd);
-
-void retopo_toggle(void*,void*);
-void retopo_do_vert(struct View3D *v3d, float *v);
-void retopo_do_all(void);
-void retopo_do_all_cb(void *, void *);
-void retopo_queue_updates(struct View3D *v3d);
-
-void retopo_matrix_update(struct View3D *v3d);
-
-void retopo_free_view_data(struct View3D *v3d);
-
-#endif
-
index 5f7ccd1441b3d02dde2c476c3ad0bc8e7442b275..b749d60e8125d03af735b9b7f2cc1c635f4cfc92 100644 (file)
@@ -58,7 +58,6 @@
 
 #include "ED_mesh.h"
 #include "ED_object.h"
-#include "ED_retopo.h"
 #include "ED_screen.h"
 #include "ED_util.h"
 #include "ED_view3d.h"
@@ -1607,7 +1606,6 @@ typedef struct UndoMesh {
        EditSelectionC *selected;
        int totvert, totedge, totface, totsel;
        int selectmode, shapenr;
-       RetopoPaintData *retopo_paint_data;
        char retopo_mode;
        CustomData vdata, edata, fdata;
 } UndoMesh;
index b06f2221a84bbb0c8d2a30c8ab45fdef9faeeaf2..4f1a732fc81b304ca23b3ef9a047d20c4b88b4c0 100644 (file)
@@ -52,6 +52,7 @@
 
 
 #include "BIF_gl.h"
+#include "BIF_glutil.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -60,7 +61,6 @@
 #include "RNA_define.h"
 
 #include "ED_particle.h"
-#include "ED_retopo.h"
 #include "ED_screen.h"
 #include "ED_transform.h"
 #include "ED_mesh.h"
index d26137bd1151e1725a6b0275be2e9a8d06eab28c..5f3713392b7ad60324eb1cf39bfa569fd8dcc278 100644 (file)
@@ -54,6 +54,7 @@
 
 
 #include "BIF_gl.h"
+#include "BIF_glutil.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -66,7 +67,6 @@
 #include "ED_particle.h"
 #include "ED_mesh.h"
 #include "ED_object.h"
-#include "ED_retopo.h"
 #include "ED_screen.h"
 #include "ED_mball.h"
 
index 0b5c563a7414fddd9c59b7713e3cb377bade84d0..a2e0525cb0e1585575d0cd8cadbdb2f67c9aa0b0 100644 (file)
@@ -62,7 +62,6 @@ set(SRC
        ../include/ED_particle.h
        ../include/ED_physics.h
        ../include/ED_render.h
-       ../include/ED_retopo.h
        ../include/ED_screen.h
        ../include/ED_screen_types.h
        ../include/ED_sculpt.h