[cig-commits] commit: moving the parent destroy to after the child destroy

[Mercurial]

changeset:   355:2ea33e98952c
branch:      pcu_rejig
user:        JulianGiordani
date:        Tue Dec 08 16:37:05 2009 +1100
files:       MaterialPoints/src/MaterialPointsSwarm.c
description:
moving the parent destroy to after the child destroy


diff -r 46dfb08a8288 -r 2ea33e98952c MaterialPoints/src/MaterialPointsSwarm.c
--- a/MaterialPoints/src/MaterialPointsSwarm.c	Tue Dec 08 13:19:01 2009 +1100
+++ b/MaterialPoints/src/MaterialPointsSwarm.c	Tue Dec 08 16:37:05 2009 +1100
@@ -463,8 +463,6 @@ void _MaterialPointsSwarm_Destroy( void*
 void _MaterialPointsSwarm_Destroy( void* swarm, void* data ) {
 	MaterialPointsSwarm*	self = (MaterialPointsSwarm*)swarm;
    int var_I;
-
-	_Swarm_Destroy( self, data );
 	
 	Stg_Component_Destroy( self->mesh, data , False );
 	if( self->escapedRoutine != NULL) Stg_Component_Destroy( self->escapedRoutine, data , False );
@@ -473,7 +471,8 @@ void _MaterialPointsSwarm_Destroy( void*
 	for( var_I = 0 ; var_I < self->nSwarmVars ; var_I++ ) {
 		Stg_Component_Destroy( self->swarmVars[var_I], data , False );
 	}
-	
+
+	_Swarm_Destroy( self, data );
 }
 
 void _MaterialPointsSwarm_UpdateHook( void* timeIntegrator, void* swarm ) {