From 979a2b496b9c3ef75759f454314d1674d6c50ea4 Mon Sep 17 00:00:00 2001 From: Jerome St-Louis Date: Fri, 17 Apr 2015 23:16:43 -0400 Subject: [PATCH] ecere/gfx3D/Object: Fixed Merge() crashing on non-mesh object --- ecere/src/gfx/3D/Object.ec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecere/src/gfx/3D/Object.ec b/ecere/src/gfx/3D/Object.ec index df0228f..b6aef7a 100644 --- 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 { -- 1.8.3.1