From e4d16a8c61bdad523d3ce888c582e9a7e1eac1ac Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Thu, 9 Sep 2021 18:33:03 -0500 Subject: [PATCH] (re) add collision yo noshape.dts set all rigidshapedatas to default to noshape instead of blank to fix the lack of a basic collision mesh blocking datablock creation --- Engine/source/T3D/rigidShape.cpp | 1 + .../game/core/rendering/shapes/noshape.dts | Bin 18389 -> 14146 bytes 2 files changed, 1 insertion(+) diff --git a/Engine/source/T3D/rigidShape.cpp b/Engine/source/T3D/rigidShape.cpp index 8eeaffb3f..cf26f8ea9 100644 --- a/Engine/source/T3D/rigidShape.cpp +++ b/Engine/source/T3D/rigidShape.cpp @@ -263,6 +263,7 @@ RigidShapeData::RigidShapeData() dustTrailEmitter = NULL; dustTrailID = 0; + _setShape(ShapeAsset::smNoShapeAssetFallback); } RigidShapeData::~RigidShapeData() diff --git a/Templates/BaseGame/game/core/rendering/shapes/noshape.dts b/Templates/BaseGame/game/core/rendering/shapes/noshape.dts index a7a64cf1099e4247aecded23bec3923eb6e3a198..81720460ca6d1a7a09297d14fb557284448412fe 100644 GIT binary patch literal 14146 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 POt$~y%yKhanquhxwppnO literal 18389 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