[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14097] trunk/blender/source/blender/src/ editmesh_tools.c:

[Brecht Van Lommel]

Revision: 14097
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14097
Author:   blendix
Date:     2008-03-13 22:14:11 +0100 (Thu, 13 Mar 2008)

Log Message:
-----------

Fix for bug #5641: edge slide doesn't work straight after remove
doubles. Also fixed some 64bit warnings in this file.

Modified Paths:
--------------
    trunk/blender/source/blender/src/editmesh_tools.c

Modified: trunk/blender/source/blender/src/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/src/editmesh_tools.c	2008-03-13 19:40:36 UTC (rev 14096)
+++ trunk/blender/source/blender/src/editmesh_tools.c	2008-03-13 21:14:11 UTC (rev 14097)
@@ -327,8 +327,12 @@
 				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(e1) {
+					e1->f2= 1;
+					if(eed->f & SELECT)
+						e1->f |= SELECT;
+				}
 				if(e1!=eed) free_editedge(eed);
 			}
 		}
@@ -6438,11 +6442,11 @@
 			
 			pnindex = ((PathNode*)s->tmp.p)->u;
 			cost[pnindex] = 0;
-			BLI_heap_insert(heap,  0.0f, (void*)pnindex);
+			BLI_heap_insert(heap,  0.0f, SET_INT_IN_POINTER(pnindex));
 						
 			while( !BLI_heap_empty(heap) ){
 				
-				pnindex = (int)BLI_heap_popmin(heap);
+				pnindex = GET_INT_FROM_POINTER(BLI_heap_popmin(heap));
 				currpn = &(Q[pnindex]);
 				
 				if(currpn == (PathNode*)t->tmp.p) /*target has been reached....*/
@@ -6454,7 +6458,7 @@
 							cost[currpe->v] = cost[currpn->u] + currpe->w;
 							previous[currpe->v] = currpn->u;
 							Q[currpe->v].visited = 1;
-							BLI_heap_insert(heap, cost[currpe->v], (void*)currpe->v);
+							BLI_heap_insert(heap, cost[currpe->v], SET_INT_IN_POINTER(currpe->v));
 						}
 					}
 				}