From ed33c70a23e6dbcf08c0e2bb1c2a4ecd757b0dac Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Tue, 5 Apr 2022 18:54:09 -0500
Subject: [PATCH] display the item to be spawned given a valid datablock name,
 use that meshes shape to display the spawnsphere mesh, rather than the
 default one

---
 Engine/source/T3D/missionMarker.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Engine/source/T3D/missionMarker.cpp b/Engine/source/T3D/missionMarker.cpp
index 005ec3491..27785d627 100644
--- a/Engine/source/T3D/missionMarker.cpp
+++ b/Engine/source/T3D/missionMarker.cpp
@@ -433,7 +433,23 @@ void SpawnSphere::unpackUpdate(NetConnection * con, BitStream * stream)
       mSpawnTransform = stream->readFlag();
 
       stream->read(&mSpawnClass);
+
+      String oldSDB = mSpawnDataBlock;
       stream->read(&mSpawnDataBlock);
+      if (oldSDB != mSpawnDataBlock)
+      {
+         ShapeBaseData *spawnedDatablock = dynamic_cast<ShapeBaseData *>(Sim::findObject(mSpawnDataBlock.c_str()));
+         if (spawnedDatablock)
+         {
+            delete mShapeInstance;
+            mShapeInstance = new TSShapeInstance(spawnedDatablock->mShape);
+         }
+         else
+         {
+            delete mShapeInstance;
+            mShapeInstance = new TSShapeInstance(mDataBlock->mShape);
+         }
+      }
       stream->read(&mSpawnName);
       stream->read(&mSpawnProperties);
       stream->read(&mSpawnScript);