[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27894] branches/render25/source/blender/ editors: fix for own errors in calling ending topology table

[Campbell Barton]

Revision: 27894
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27894
Author:   campbellbarton
Date:     2010-03-31 09:09:15 +0200 (Wed, 31 Mar 2010)

Log Message:
-----------
fix for own errors in calling ending topology table

Modified Paths:
--------------
    branches/render25/source/blender/editors/include/ED_mesh.h
    branches/render25/source/blender/editors/mesh/editmesh.c
    branches/render25/source/blender/editors/object/object_edit.c
    branches/render25/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/render25/source/blender/editors/space_sequencer/sequencer_select.c
    branches/render25/source/blender/editors/util/ed_util.c

Modified: branches/render25/source/blender/editors/include/ED_mesh.h
===================================================================
--- branches/render25/source/blender/editors/include/ED_mesh.h	2010-03-31 07:03:13 UTC (rev 27893)
+++ branches/render25/source/blender/editors/include/ED_mesh.h	2010-03-31 07:09:15 UTC (rev 27894)
@@ -78,6 +78,8 @@
 /* meshtools.c */
 
 intptr_t	mesh_octree_table(struct Object *ob, struct EditMesh *em, float *co, char mode);
+long		mesh_mirrtopo_table(struct Object *ob, char mode);
+
 struct EditVert   *editmesh_get_x_mirror_vert(struct Object *ob, struct EditMesh *em, struct EditVert *eve, float *co, int index);
 int			mesh_get_x_mirror_vert(struct Object *ob, int index);
 int			*mesh_get_x_mirror_faces(struct Object *ob, struct EditMesh *em);

Modified: branches/render25/source/blender/editors/mesh/editmesh.c
===================================================================
--- branches/render25/source/blender/editors/mesh/editmesh.c	2010-03-31 07:03:13 UTC (rev 27893)
+++ branches/render25/source/blender/editors/mesh/editmesh.c	2010-03-31 07:09:15 UTC (rev 27894)
@@ -563,7 +563,7 @@
 	em->allfaces= em->curface= NULL;
 	
 	mesh_octree_table(NULL, NULL, NULL, 'e');
-	mesh_mirrtopo_table(NULL, NULL, NULL, 'e');
+	mesh_mirrtopo_table(NULL, 'e');
 
 	em->totvert= em->totedge= em->totface= 0;
 

Modified: branches/render25/source/blender/editors/object/object_edit.c
===================================================================
--- branches/render25/source/blender/editors/object/object_edit.c	2010-03-31 07:03:13 UTC (rev 27893)
+++ branches/render25/source/blender/editors/object/object_edit.c	2010-03-31 07:09:15 UTC (rev 27894)
@@ -263,7 +263,7 @@
 		
 		if(obedit->restore_mode & OB_MODE_WEIGHT_PAINT) {
 			mesh_octree_table(NULL, NULL, NULL, 'e');
-			mesh_mirrtopo_table(NULL, NULL, NULL, 'e');
+			mesh_mirrtopo_table(NULL, 'e');
 		}
 	}
 	else if (obedit->type==OB_ARMATURE) {	

Modified: branches/render25/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- branches/render25/source/blender/editors/sculpt_paint/paint_vertex.c	2010-03-31 07:03:13 UTC (rev 27893)
+++ branches/render25/source/blender/editors/sculpt_paint/paint_vertex.c	2010-03-31 07:09:15 UTC (rev 27894)
@@ -1112,7 +1112,7 @@
 	}
 	else {
 		mesh_octree_table(NULL, NULL, NULL, 'e');
-		mesh_mirrtopo_table(NULL, NULL, NULL, 'e');
+		mesh_mirrtopo_table(NULL, 'e');
 	}
 	
 	WM_event_add_notifier(C, NC_SCENE|ND_MODE, scene);

Modified: branches/render25/source/blender/editors/space_sequencer/sequencer_select.c
===================================================================
--- branches/render25/source/blender/editors/space_sequencer/sequencer_select.c	2010-03-31 07:03:13 UTC (rev 27893)
+++ branches/render25/source/blender/editors/space_sequencer/sequencer_select.c	2010-03-31 07:09:15 UTC (rev 27894)
@@ -381,7 +381,7 @@
 				TimeMarker *marker;
 
 				for (marker= scene->markers.first; marker; marker= marker->next) {
-					if(	(x < CFRA) && (marker->frame < CFRA) ||
+					if(	((x < CFRA) && marker->frame < CFRA) ||
 						((x >= CFRA) && marker->frame >= CFRA)
 					) {
 						marker->flag |= SELECT;

Modified: branches/render25/source/blender/editors/util/ed_util.c
===================================================================
--- branches/render25/source/blender/editors/util/ed_util.c	2010-03-31 07:03:13 UTC (rev 27893)
+++ branches/render25/source/blender/editors/util/ed_util.c	2010-03-31 07:09:15 UTC (rev 27894)
@@ -65,7 +65,7 @@
 		
 			/* global in meshtools... */
 			mesh_octree_table(NULL, NULL, NULL, 'e');
-			mesh_mirrtopo_table(NULL, NULL, NULL, 'e');
+			mesh_mirrtopo_table(NULL, 'e');
 			
 			if(ob) {
 				if(ob->type==OB_MESH) {
@@ -94,7 +94,7 @@
 			/* if weight-painting is on, free mesh octree data */
 			if(ob->mode & OB_MODE_WEIGHT_PAINT) {
 				mesh_octree_table(NULL, NULL, NULL, 'e');
-				mesh_mirrtopo_table(NULL, NULL, NULL, 'e');
+				mesh_mirrtopo_table(NULL, 'e');
 			}
 		}
 	}