Changeset 7859 for OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/ControlRecords.cpp

Timestamp:

02/18/08 14:52:26 (5 years ago)

Author:

robert

Message:

From Brede Johansen, "Here's a fix to the changes regarding the new dispose() function. The
last primary node inside a push-pop level would not get the dispose()
call. This would result in information from some ancillary records,
like the matrix (transform), being lost.

Changes are made to the latest version in the repository.

Thanks to Terry for the help to find and fix the bug and test the changes."

Files:

• OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/ControlRecords.cpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/ControlRecords.cpp

@@ -64 +64 @@
         virtual void read(RecordInputStream& /*in*/, Document& document)
         {
-            // Finally call dispose() for primary with push, pop level pair. 
-            PrimaryRecord* primary = document.getTopOfLevelStack();
-            if (primary)
+            PrimaryRecord* parentPrimary = document.getTopOfLevelStack();
+            PrimaryRecord* currentPrimary = document.getCurrentPrimaryRecord();
+
+            // Call dispose() for primary without push, pop level pair. 
+            if (currentPrimary && currentPrimary!=parentPrimary)
             {
-                primary->dispose(document);
+                currentPrimary->dispose(document);
             }
 
+            // Call dispose() for primary with push, pop level pair. 
+            if (parentPrimary)
+            {
+                parentPrimary->dispose(document);
+            }
+
             document.popLevel();
         }