[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41424] branches/bmesh/blender/source: minor cleanup edits

Campbell Barton ideasman42 at gmail.com
Tue Nov 1 04:02:40 CET 2011


Revision: 41424
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41424
Author:   campbellbarton
Date:     2011-11-01 03:02:33 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
minor cleanup edits

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/bmesh_queries.h
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
    branches/bmesh/blender/source/blender/bmesh/operators/createops.c
    branches/bmesh/blender/source/creator/creator.c

Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_queries.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_queries.h	2011-11-01 02:59:55 UTC (rev 41423)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_queries.h	2011-11-01 03:02:33 UTC (rev 41424)
@@ -20,6 +20,8 @@
 
 int BM_Vert_In_Edge(struct BMEdge *e, struct BMVert *v);
 
+int BM_Verts_In_Edge(struct BMVert *v1, struct BMVert *v2, struct BMEdge *e);
+
 /*get opposing vert from v in edge e.*/
 struct BMVert *BM_OtherEdgeVert(struct BMEdge *e, struct BMVert *v);
 

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c	2011-11-01 02:59:55 UTC (rev 41423)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c	2011-11-01 03:02:33 UTC (rev 41424)
@@ -22,7 +22,7 @@
 static int bmesh_opname_to_opcode(const char *opname);
 
 static const char *bmop_error_messages[] = {
-       0,
+       NULL,
        "Self intersection error",
        "Could not dissolve vert",
        "Could not connect vertices",

Modified: branches/bmesh/blender/source/blender/bmesh/operators/createops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/createops.c	2011-11-01 02:59:55 UTC (rev 41423)
+++ branches/bmesh/blender/source/blender/bmesh/operators/createops.c	2011-11-01 03:02:33 UTC (rev 41424)
@@ -141,7 +141,7 @@
 	return NULL;
 }
 
-static struct BMEdge *rotsys_reverse(struct BMEdge *UNUSED(e), struct BMVert *v, EdgeData *edata, VertData *vdata)
+static void rotsys_reverse(struct BMEdge *UNUSED(e), struct BMVert *v, EdgeData *edata, VertData *vdata)
 {
 	BMEdge **edges = NULL;
 	BMEdge *e2;
@@ -165,8 +165,6 @@
 	}
 	
 	BLI_array_free(edges);
-	
-	return 0;
 }
 
 static int rotsys_count(struct BMVert *v, EdgeData *edata, VertData *vdata)

Modified: branches/bmesh/blender/source/creator/creator.c
===================================================================
--- branches/bmesh/blender/source/creator/creator.c	2011-11-01 02:59:55 UTC (rev 41423)
+++ branches/bmesh/blender/source/creator/creator.c	2011-11-01 03:02:33 UTC (rev 41424)
@@ -319,7 +319,7 @@
 
 double PIL_check_seconds_timer(void);
 
-void segmentation_handler(int UNUSED(sig))
+static void segmentation_handler(int UNUSED(sig))
 {
 	char fname[256];
 




More information about the Bf-blender-cvs mailing list