ecere/gfx3D/Object: Fixed Merge() crashing on non-mesh object

diff --git a/ecere/src/gfx/3D/Object.ec b/ecere/src/gfx/3D/Object.ec
index df0228f..b6aef7a 100644 (file)
--- a/ecere/src/gfx/3D/Object.ec
+++ b/ecere/src/gfx/3D/Object.ec
@@ -767,7 +767,7 @@ public:
    {
       bool result = false;
 
-      if(!children.first && this.flags.ownMesh)
+      if(!this.flags.mesh || (!children.first && this.flags.ownMesh))
          result = true;
       else
       {