[QGIS Commit] r15696 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2011-04-13 00:03:14 -0700 (Wed, 13 Apr 2011)
New Revision: 15696

Modified:
   trunk/qgis/src/core/qgsvectorlayer.cpp
Log:
Fix for bug #3685, take2

Modified: trunk/qgis/src/core/qgsvectorlayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.cpp	2011-04-12 12:26:05 UTC (rev 15695)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp	2011-04-13 07:03:14 UTC (rev 15696)
@@ -757,6 +757,12 @@
       // render feature
       mRendererV2->renderFeature( fet, rendererContext, -1, sel, drawMarker );
 
+      if ( mEditable )
+      {
+        // Cache this for the use of (e.g.) modifying the feature's uncommitted geometry.
+        mCachedGeometries[fet.id()] = *fet.geometry();
+      }
+
       // labeling - register feature
       if ( mRendererV2->symbolForFeature( fet ) != NULL )
       {
@@ -769,12 +775,6 @@
           rendererContext.labelingEngine()->registerDiagramFeature( this, fet, rendererContext );
         }
       }
-
-      if ( mEditable )
-      {
-        // Cache this for the use of (e.g.) modifying the feature's uncommitted geometry.
-        mCachedGeometries[fet.id()] = *fet.geometry();
-      }
     }
     catch ( const QgsCsException &cse )
     {
@@ -834,6 +834,12 @@
     }
     features[sym].append( fet );
 
+    if ( mEditable )
+    {
+      // Cache this for the use of (e.g.) modifying the feature's uncommitted geometry.
+      mCachedGeometries[fet.id()] = *fet.geometry();
+    }
+
     if ( mRendererV2->symbolForFeature( fet ) != NULL )
     {
       if ( labeling )
@@ -846,11 +852,6 @@
       }
     }
 
-    if ( mEditable )
-    {
-      // Cache this for the use of (e.g.) modifying the feature's uncommitted geometry.
-      mCachedGeometries[fet.id()] = *fet.geometry();
-    }
 #ifndef Q_WS_MAC
     ++featureCount;
 #endif //Q_WS_MAC