[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44029] branches/bmesh/blender/source/ blender: mode bmesh include cleanup, remove unused file too.

Campbell Barton ideasman42 at gmail.com
Sat Feb 11 11:15:24 CET 2012


Revision: 44029
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44029
Author:   campbellbarton
Date:     2012-02-11 10:15:11 +0000 (Sat, 11 Feb 2012)
Log Message:
-----------
mode bmesh include cleanup, remove unused file too.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/CMakeLists.txt
    branches/bmesh/blender/source/blender/bmesh/bmesh.h
    branches/bmesh/blender/source/blender/bmesh/bmesh_class.h
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_queries.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
    branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c
    branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
    branches/bmesh/blender/source/blender/bmesh/operators/mirror.c
    branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c
    branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
    branches/bmesh/blender/source/blender/bmesh/operators/utils.c
    branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
    branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
    branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
    branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c
    branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_array.c

Removed Paths:
-------------
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_filters.c

Modified: branches/bmesh/blender/source/blender/bmesh/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/CMakeLists.txt	2012-02-11 08:58:53 UTC (rev 44028)
+++ branches/bmesh/blender/source/blender/bmesh/CMakeLists.txt	2012-02-11 10:15:11 UTC (rev 44029)
@@ -95,7 +95,6 @@
 	intern/bmesh_polygon.c
 	intern/bmesh_queries.c
 	intern/bmesh_opdefines.c
-	intern/bmesh_filters.c
 	intern/bmesh_eulers.c
 	intern/bmesh_operators.c
 	intern/bmesh_private.h

Modified: branches/bmesh/blender/source/blender/bmesh/bmesh.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh.h	2012-02-11 08:58:53 UTC (rev 44028)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh.h	2012-02-11 10:15:11 UTC (rev 44029)
@@ -30,13 +30,12 @@
 #endif
 
 #include "DNA_listBase.h"
-#include "DNA_scene_types.h"
 #include "DNA_customdata_types.h"
 
-#include "BKE_customdata.h"
-
 #include "BLI_utildefines.h"
 
+#include "bmesh_class.h"
+
 /*
  * short introduction:
  *
@@ -107,8 +106,6 @@
 
 /* #define BM_NONORMCALC (1<<8) */ /* UNUSED */
 
-#include "bmesh_class.h"
-
 /* stub */
 void bmesh_error(void);
 

Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_class.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_class.h	2012-02-11 08:58:53 UTC (rev 44028)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_class.h	2012-02-11 10:15:11 UTC (rev 44029)
@@ -25,11 +25,6 @@
 
 /*bmesh data structures*/
 
-#include "DNA_listBase.h"
-
-#include "BKE_utildefines.h"
-#include "BLI_utildefines.h"
-
 struct BMesh;
 struct BMVert;
 struct BMEdge;

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c	2012-02-11 08:58:53 UTC (rev 44028)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c	2012-02-11 10:15:11 UTC (rev 44029)
@@ -33,24 +33,16 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BKE_customdata.h"
-#include "BKE_utildefines.h"
-
 #include "BLI_array.h"
-#include "BLI_utildefines.h"
+#include "BLI_math.h"
 
+#include "BKE_customdata.h"
+
 #include "DNA_meshdata_types.h"
-#include "DNA_mesh_types.h"
 
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
-
 #include "bmesh.h"
 #include "bmesh_private.h"
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
 
 #define SELECT 1
 

Deleted: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_filters.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_filters.c	2012-02-11 08:58:53 UTC (rev 44028)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_filters.c	2012-02-11 10:15:11 UTC (rev 44029)
@@ -1,33 +0,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.
- *
- * Contributor(s): Joseph Eagar, Geoffrey Bantle, Campbell Barton
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/bmesh/intern/bmesh_filters.c
- *  \ingroup bmesh
- *
- * BM Filter API. Not used yet.
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "bmesh.h"
-#include "bmesh_private.h"

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c	2012-02-11 08:58:53 UTC (rev 44028)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c	2012-02-11 10:15:11 UTC (rev 44029)
@@ -28,7 +28,6 @@
  * See: bmesh_iterators_inlin.c too, some functions are here for speed reasons.
  */
 
-#include <string.h>
 
 #include "bmesh.h"
 #include "bmesh_private.h"

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c	2012-02-11 08:58:53 UTC (rev 44028)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c	2012-02-11 10:15:11 UTC (rev 44029)
@@ -33,15 +33,13 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BKE_utildefines.h"
+#include "DNA_scene_types.h"
 
 #include "BLI_math.h"
 #include "BLI_listbase.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
 
-#include <string.h>
 
 /*
  * BMESH SELECTMODE FLUSH

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c	2012-02-11 08:58:53 UTC (rev 44028)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c	2012-02-11 10:15:11 UTC (rev 44029)
@@ -46,7 +46,6 @@
 
 #include "ED_mesh.h"
 
-#include "bmesh.h"
 #include "bmesh_private.h"
 
 /* bmesh_error stub */

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c	2012-02-11 08:58:53 UTC (rev 44028)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c	2012-02-11 10:15:11 UTC (rev 44029)
@@ -27,25 +27,16 @@
  * the topology of existing mesh data. (split, join, flip etc).
  */
 
-#include <limits.h>
 #include "MEM_guardedalloc.h"
 
-#include "DNA_listBase.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_linklist.h"
-#include "BLI_ghash.h"
 #include "BLI_math.h"
 #include "BLI_array.h"
-#include "BLI_utildefines.h"
 #include "BLI_smallhash.h"
 
 #include "bmesh.h"
 #include "bmesh_private.h"
 
-#include <stdlib.h>
-#include <string.h>
-
 /**
  *			bmesh_dissolve_disk
  *

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c	2012-02-11 08:58:53 UTC (rev 44028)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c	2012-02-11 10:15:11 UTC (rev 44029)
@@ -23,29 +23,20 @@
 /** \file blender/bmesh/intern/bmesh_newcore.c
  *  \ingroup bmesh
  *
- * TODO
  */
 
 #include <limits.h>
 
+#include "MEM_guardedalloc.h"
+
 #include "BLI_math_vector.h"
 
-#include "BKE_customdata.h"
 #include "BKE_DerivedMesh.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_listbase.h"
-#include "BLI_mempool.h"
-#include "BLI_ghash.h"
 #include "BLI_array.h"
 
-#include "MEM_guardedalloc.h"
-
-#include "DNA_listBase.h"
-
-#include "bmesh_class.h"
-
-#include "bmesh_iterators.h"
+#include "bmesh.h"
 #include "bmesh_private.h"
 
 /* use so valgrinds memcheck alerts us when undefined index is used.

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_opdefines.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_opdefines.c	2012-02-11 08:58:53 UTC (rev 44028)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_opdefines.c	2012-02-11 10:15:11 UTC (rev 44029)
@@ -56,9 +56,7 @@
 
 #include "bmesh.h"
 #include "bmesh_private.h"
-#include <stdio.h>
 
-
 /* ok, I'm going to write a little docgen script. so all
  * bmop comments must conform to the following template/rules:
  *

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c	2012-02-11 08:58:53 UTC (rev 44028)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c	2012-02-11 10:15:11 UTC (rev 44029)
@@ -40,8 +40,6 @@
 #include "bmesh_private.h"
 #include "stdarg.h"
 
-#include <string.h>
-
 /* forward declarations */
 static void alloc_flag_layer(BMesh *bm);
 static void free_flag_layer(BMesh *bm);

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c	2012-02-11 08:58:53 UTC (rev 44028)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c	2012-02-11 10:15:11 UTC (rev 44029)
@@ -35,15 +35,8 @@
  *    degenerate faces.
  */
 
-#include <string.h>
-#include <math.h>
-#include <stdlib.h>
-
-#include "BKE_utildefines.h"
-
 #include "BLI_math.h"
 #include "BLI_array.h"
-#include "BLI_utildefines.h"
 
 #include "MEM_guardedalloc.h"
 

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h	2012-02-11 08:58:53 UTC (rev 44028)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h	2012-02-11 10:15:11 UTC (rev 44029)
@@ -36,7 +36,6 @@
 #ifndef BMESH_PRIVATE_H
 #define BMESH_PRIVATE_H
 
-#include "bmesh.h"
 struct Link;
 struct BMLoop;
 

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_queries.c	2012-02-11 08:58:53 UTC (rev 44028)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_queries.c	2012-02-11 10:15:11 UTC (rev 44029)
@@ -31,16 +31,11 @@
  * of inspecting the mesh structure directly.
  */
 
-#include <string.h>
+#include "BLI_math.h"
 
 #include "bmesh.h"
 #include "bmesh_private.h"
 
-#include "BKE_utildefines.h"
-
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
-
 #define BM_OVERLAP (1 << 13)
 
 /*

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list