* src/libavoid/connector.cpp, src/libavoid/connector.h,

      src/libavoid/shape.cpp, src/libavoid/graph.cpp,
      src/libavoid/incremental.cpp, src/libavoid/incremental.h,
      src/libavoid/static.cpp, src/libavoid/visibility.cpp, 
      src/libavoid/makepath.cpp:

    Some minor upstream libavoid fixes.

(bzr r25)

1 files changed, 5 insertions, 5 deletions

diff --git a/src/libavoid/incremental.cpp b/src/libavoid/incremental.cpp
index 3830c70ee..f7d48ac70 100644
--- a/src/libavoid/incremental.cpp
+++ b/src/libavoid/incremental.cpp
@@ -29,7 +29,7 @@ namespace Avoid {
 
 void addShape(ShapeRef *shape)
 {
-    uint pid = shape->id();
+    unsigned int pid = shape->id();
     Polygn poly = shape->poly();
     
     adjustContainsWithAdd(poly, pid);
@@ -53,7 +53,7 @@ void addShape(ShapeRef *shape)
 
 void delShape(ShapeRef *shape)
 {
-    uint pid = shape->id();
+    unsigned int pid = shape->id();
 
     // o  Remove entries related to this shape's vertices
     shape->removeFromGraph();
@@ -81,14 +81,14 @@ void delShape(ShapeRef *shape)
 }
 
 
-ShapeRef *moveShape(ShapeRef *oldShape, Polygn *newPoly)
+ShapeRef *moveShape(ShapeRef *oldShape, Polygn *newPoly, const bool first_move)
 {
-    uint pid = oldShape->id();
+    unsigned int pid = oldShape->id();
     
     // o  Remove entries related to this shape's vertices
     oldShape->removeFromGraph();
     
-    if (SelectiveReroute && !(PartialFeedback && PartialTime))
+    if (SelectiveReroute && (!(PartialFeedback && PartialTime) || first_move))
     {
         markConnectors(oldShape);
     }