Merge branch 'master' of github.com:qgis/Quantum-GIS

This commit is contained in:
Marco Hugentobler 2013-12-05 17:19:16 +01:00
commit 705927e087

View File

@ -5221,6 +5221,12 @@ bool QgsGeometry::exportGeosToWkb() const
bool QgsGeometry::convertToMultiType() bool QgsGeometry::convertToMultiType()
{ {
// TODO: implement with GEOS
if ( mDirtyWkb )
{
exportGeosToWkb();
}
if ( !mGeometry ) if ( !mGeometry )
{ {
return false; return false;