From b97f8c12714f5dab038fa00e0df005e9767eaba0 Mon Sep 17 00:00:00 2001
From: "rem..om" <remy.bouquet@gmail.com>
Date: Fri, 8 Jun 2012 20:22:36 +0000
Subject: [PATCH] BatchNode : fixed an issue when a geometry was not unbatched
 when removed with sometihing else than removeFromParent

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9462 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 engine/src/core/com/jme3/scene/Geometry.java | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/engine/src/core/com/jme3/scene/Geometry.java b/engine/src/core/com/jme3/scene/Geometry.java
index 3ae9c3aad..ee07711c8 100644
--- a/engine/src/core/com/jme3/scene/Geometry.java
+++ b/engine/src/core/com/jme3/scene/Geometry.java
@@ -329,15 +329,19 @@ public class Geometry extends Spatial {
     }
 
     @Override
-    public boolean removeFromParent() {
-        boolean removed = super.removeFromParent();
-        //if the geometry is batched we also have to unbatch it
-        if (isBatched()) {
-            unBatch();
-        }
-        return removed;
+    public boolean removeFromParent() {       
+        return super.removeFromParent();
     }
 
+    @Override
+    protected void setParent(Node parent) {
+        super.setParent(parent);
+         //if the geometry is batched we also have to unbatch it
+        if(parent==null && isBatched()){
+             unBatch();
+        }
+    }
+    
     /**
      * Recomputes the cached offset matrix used when the geometry is batched     * 
      */