Revision: 44259
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44259
Author: campbellbarton
Date: 2012-02-19 19:32:41 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
remove more unused files.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/CMakeLists.txt
trunk/blender/source/blender/editors/mesh/CMakeLists.txt
Removed Paths:
-------------
trunk/blender/source/blender/bmesh/editmesh_tools.c
trunk/blender/source/blender/bmesh/tools/BME_dupe_ops.c
trunk/blender/source/blender/bmesh/tools/BME_duplicate.c
trunk/blender/source/blender/bmesh/tools/BME_weld.c
Modified: trunk/blender/source/blender/bmesh/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/bmesh/CMakeLists.txt 2012-02-19 19:27:06 UTC
(rev 44258)
+++ trunk/blender/source/blender/bmesh/CMakeLists.txt 2012-02-19 19:32:41 UTC
(rev 44259)
@@ -80,28 +80,29 @@
operators/bmo_triangulate.c
operators/bmo_utils.c
- intern/bmesh_newcore.c
+ intern/bmesh_construct.c
+ intern/bmesh_inline.c
intern/bmesh_interp.c
intern/bmesh_iterators.c
intern/bmesh_iterators_inline.c
intern/bmesh_marking.c
intern/bmesh_mesh.c
intern/bmesh_mods.c
- intern/bmesh_structure.h
- intern/bmesh_construct.c
+ intern/bmesh_newcore.c
+ intern/bmesh_opdefines.c
+ intern/bmesh_operators.c
intern/bmesh_operators_private.h
- intern/bmesh_structure.c
intern/bmesh_polygon.c
+ intern/bmesh_private.h
intern/bmesh_queries.c
- intern/bmesh_opdefines.c
- intern/bmesh_operators.c
- intern/bmesh_private.h
+ intern/bmesh_structure.c
+ intern/bmesh_structure.h
intern/bmesh_walkers.c
intern/bmesh_walkers_impl.c
intern/bmesh_walkers_private.h
- intern/bmesh_inline.c
tools/BME_bevel.c
+
bmesh.h
bmesh_class.h
bmesh_error.h
Deleted: trunk/blender/source/blender/bmesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/bmesh/editmesh_tools.c 2012-02-19 19:27:06 UTC
(rev 44258)
+++ trunk/blender/source/blender/bmesh/editmesh_tools.c 2012-02-19 19:32:41 UTC
(rev 44259)
@@ -1,6384 +0,0 @@
-#if 0
-
-/*
- * ***** 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) 2004 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): Johnny Matthews, Geoffrey Bantle.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/*
-
-editmesh_tool.c: UI called tools for editmesh, geometry changes here,
otherwise in mods.c
-
-*/
-
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-#include "MEM_guardedalloc.h"
-
-#include "BMF_Api.h"
-#include "DNA_mesh_types.h"
-#include "DNA_material_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_view3d_types.h"
-#include "DNA_key_types.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-#include "BLI_editVert.h"
-#include "BLI_rand.h"
-#include "BLI_ghash.h"
-#include "BLI_linklist.h"
-#include "BLI_heap.h"
-
-#include "BKE_depsgraph.h"
-#include "BKE_customdata.h"
-#include "BKE_global.h"
-#include "BKE_library.h"
-#include "BKE_mesh.h"
-#include "BKE_object.h"
-#include "BKE_utildefines.h"
-#include "BKE_bmesh.h"
-
-#ifdef WITH_VERSE
-#include "BKE_verse.h"
-#endif
-
-#include "BIF_cursors.h"
-#include "BIF_editmesh.h"
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
-#include "BIF_graphics.h"
-#include "BIF_interface.h"
-#include "BIF_mywindow.h"
-#include "BIF_screen.h"
-#include "BIF_space.h"
-#include "BIF_resources.h"
-#include "BIF_toolbox.h"
-#include "BIF_transform.h"
-#include "transform.h"
-
-#ifdef WITH_VERSE
-#include "BIF_verse.h"
-#endif
-
-#include "BDR_drawobject.h"
-#include "BDR_editobject.h"
-
-#include "BSE_view.h"
-#include "BSE_edit.h"
-
-#include "blendef.h"
-#include "multires.h"
-#include "mydevice.h"
-
-#include "editmesh.h"
-
-#include "MTC_vectorops.h"
-
-#include "PIL_time.h"
-
-#include "BLO_sys_types.h" // for intptr_t support
-
-/* local prototypes ---------------*/
-void bevel_menu(void);
-static void free_tagged_edges_faces(EditEdge *eed, EditFace *efa);
-
-/********* qsort routines *********/
-
-
-typedef struct xvertsort {
- float x;
- EditVert *v1;
-} xvertsort;
-
-static int vergxco(const void *v1, const void *v2)
-{
- const xvertsort *x1=v1, *x2=v2;
-
- if( x1->x > x2->x ) return 1;
- else if( x1->x < x2->x) return -1;
- return 0;
-}
-
-struct facesort {
- uintptr_t x;
- struct EditFace *efa;
-};
-
-
-static int vergface(const void *v1, const void *v2)
-{
- const struct facesort *x1=v1, *x2=v2;
-
- if( x1->x > x2->x ) return 1;
- else if( x1->x < x2->x) return -1;
- return 0;
-}
-
-
-/* *********************************** */
-
-void convert_to_triface(int direction)
-{
- EditMesh *em = G.editMesh;
- EditFace *efa, *efan, *next;
- float fac;
-
- if(multires_test()) return;
-
- efa= em->faces.last;
- while(efa) {
- next= efa->prev;
- if(efa->v4) {
- if(efa->f & SELECT) {
- /* choose shortest diagonal for split */
- fac= len_v3v3(efa->v1->co, efa->v3->co) -
len_v3v3(efa->v2->co, efa->v4->co);
- /* this makes sure exact squares get split
different in both cases */
- if( (direction==0 && fac<FLT_EPSILON) ||
(direction && fac>0.0f) ) {
- efan= EM_face_from_faces(efa, NULL, 0,
1, 2, -1);
- if(efa->f & SELECT)
EM_select_face(efan, 1);
- efan= EM_face_from_faces(efa, NULL, 0,
2, 3, -1);
- if(efa->f & SELECT)
EM_select_face(efan, 1);
- }
- else {
- efan= EM_face_from_faces(efa, NULL, 0,
1, 3, -1);
- if(efa->f & SELECT)
EM_select_face(efan, 1);
- efan= EM_face_from_faces(efa, NULL, 1,
2, 3, -1);
- if(efa->f & SELECT)
EM_select_face(efan, 1);
- }
-
- BLI_remlink(&em->faces, efa);
- free_editface(efa);
- }
- }
- efa= next;
- }
-
- EM_fgon_flags(); // redo flags and indices for fgons
-
-#ifdef WITH_VERSE
- if(G.editMesh->vnode)
- sync_all_versefaces_with_editfaces((VNode*)G.editMesh->vnode);
-#endif
- BIF_undo_push("Convert Quads to Triangles");
-
-}
-
-int removedoublesflag(short flag, short automerge, float limit)
/* return amount */
-{
- /*
- flag - Test with vert->flags
- automerge - Alternative operation, merge unselected into
selected.
- Used for "Auto Weld" mode. warning.
- limit - Quick manhattan distance between verts.
- */
-
- EditMesh *em = G.editMesh;
- /* all verts with (flag & 'flag') are being evaluated */
- EditVert *eve, *v1, *nextve;
- EditEdge *eed, *e1, *nexted;
- EditFace *efa, *nextvl;
- xvertsort *sortblock, *sb, *sb1;
- struct facesort *vlsortblock, *vsb, *vsb1;
- int a, b, test, amount;
-
- if(multires_test()) return 0;
-
-
- /* flag 128 is cleared, count */
-
- /* Normal non weld operation */
- eve= em->verts.first;
- amount= 0;
- while(eve) {
- eve->f &= ~128;
- if(eve->h==0 && (automerge || (eve->f & flag))) amount++;
- eve= eve->next;
- }
- if(amount==0) return 0;
-
- /* allocate memory and qsort */
- sb= sortblock= MEM_mallocN(sizeof(xvertsort)*amount,"sortremovedoub");
- eve= em->verts.first;
- while(eve) {
- if(eve->h==0 && (automerge || (eve->f & flag))) {
- sb->x= eve->co[0]+eve->co[1]+eve->co[2];
- sb->v1= eve;
- sb++;
- }
- eve= eve->next;
- }
- qsort(sortblock, amount, sizeof(xvertsort), vergxco);
-
-
- /* test for doubles */
- sb= sortblock;
- if (automerge) {
- for(a=0; a<amount; a++, sb++) {
- eve= sb->v1;
- if( (eve->f & 128)==0 ) {
- sb1= sb+1;
- for(b=a+1; b<amount && (eve->f & 128)==0; b++,
sb1++) {
- if(sb1->x - sb->x > limit) break;
-
- /* when automarge, only allow
unselected->selected */
- v1= sb1->v1;
- if( (v1->f & 128)==0 ) {
- if ((eve->f & flag)==0 &&
(v1->f & flag)==1) {
- if(
(float)fabs(v1->co[0]-eve->co[0])<=limit &&
-
(float)fabs(v1->co[1]-eve->co[1])<=limit &&
-
(float)fabs(v1->co[2]-eve->co[2])<=limit)
- { /* unique bit */
- eve->f|= 128;
- eve->tmp.v = v1;
- }
- } else if( (eve->f &
flag)==1 && (v1->f & flag)==0 ) {
- if(
(float)fabs(v1->co[0]-eve->co[0])<=limit &&
-
(float)fabs(v1->co[1]-eve->co[1])<=limit &&
-
(float)fabs(v1->co[2]-eve->co[2])<=limit)
- { /* unique bit */
- v1->f|= 128;
- v1->tmp.v = eve;
- }
- }
- }
- }
- }
- }
- } else {
- for(a=0; a<amount; a++, sb++) {
- eve= sb->v1;
- if( (eve->f & 128)==0 ) {
- sb1= sb+1;
- for(b=a+1; b<amount; b++, sb1++) {
- /* first test: simpel dist */
- if(sb1->x - sb->x > limit) break;
- v1= sb1->v1;
-
- /* second test: is vertex allowed */
- if( (v1->f & 128)==0 ) {
- if(
(float)fabs(v1->co[0]-eve->co[0])<=limit &&
-
(float)fabs(v1->co[1]-eve->co[1])<=limit &&
-
(float)fabs(v1->co[2]-eve->co[2])<=limit)
- {
- v1->f|= 128;
- v1->tmp.v = eve;
- }
- }
- }
- }
- }
- }
- MEM_freeN(sortblock);
-
- if (!automerge)
- for(eve = em->verts.first; eve; eve=eve->next)
- if((eve->f & flag) && (eve->f & 128))
- EM_data_interp_from_verts(eve, eve->tmp.v,
eve->tmp.v, 0.5f);
-
- /* test edges and insert again */
- eed= em->edges.first;
- while(eed) {
- eed->f2= 0;
- eed= eed->next;
- }
- eed= em->edges.last;
- while(eed) {
- nexted= eed->prev;
-
- if(eed->f2==0) {
- if( (eed->v1->f & 128) || (eed->v2->f & 128) ) {
- remedge(eed);
-
- if(eed->v1->f & 128) eed->v1 = eed->v1->tmp.v;
- if(eed->v2->f & 128) eed->v2 = eed->v2->tmp.v;
- e1= addedgelist(eed->v1, eed->v2, eed);
-
- if(e1) {
- e1->f2= 1;
- if(eed->f & SELECT)
- e1->f |= SELECT;
- }
- if(e1!=eed) free_editedge(eed);
- }
- }
- eed= nexted;
- }
-
- /* first count amount of test faces */
- efa= (struct EditFace *)em->faces.first;
- amount= 0;
- while(efa) {
- efa->f1= 0;
- if(efa->v1->f & 128) efa->f1= 1;
- else if(efa->v2->f & 128) efa->f1= 1;
- else if(efa->v3->f & 128) efa->f1= 1;
- else if(efa->v4 && (efa->v4->f & 128)) efa->f1= 1;
-
- if(efa->f1==1) amount++;
- efa= efa->next;
- }
-
- /* test faces for double vertices, and if needed remove them */
- efa= (struct EditFace *)em->faces.first;
- while(efa) {
- nextvl= efa->next;
- if(efa->f1==1) {
-
- if(efa->v1->f & 128) efa->v1= efa->v1->tmp.v;
- if(efa->v2->f & 128) efa->v2= efa->v2->tmp.v;
- if(efa->v3->f & 128) efa->v3= efa->v3->tmp.v;
- if(efa->v4 && (efa->v4->f & 128)) efa->v4=
efa->v4->tmp.v;
-
- test= 0;
@@ 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
