Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	dep/PackageList.txt
	src/tools/map_extractor/System.cpp

1 files changed, 5 insertions, 1 deletions

diff --git a/dep/g3dlite/include/G3D/PointHashGrid.h b/dep/g3dlite/include/G3D/PointHashGrid.h
index 5b128d1b5d9..d0b60a88ae5 100644
--- a/dep/g3dlite/include/G3D/PointHashGrid.h
+++ b/dep/g3dlite/include/G3D/PointHashGrid.h
@@ -360,7 +360,7 @@ public:
                      m_arrayIndex(0), m_epoch(0) {}
 
         Iterator(const ThisType* grid) : 
-            m_isEnd(false),
+            m_isEnd(grid->size() == 0),
             m_grid(grid),
             m_tableIterator( grid->m_data.begin() ),
             m_arrayIndex(0),
@@ -387,6 +387,10 @@ public:
             }
         }
 
+        bool hasMore() const {
+            return ! m_isEnd;
+        }
+
         bool operator==(const Iterator& other) const {
             return !(*this != other);
         }