Fix segfault in GpuRays with multiple reloads

Signed-off-by: Michael Carroll <[email protected]>
gazebosim · Aug 12, 2022 · 88421a4 · 88421a4
1 parent 87c5525
commit 88421a4
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/ogre/src/OgreGpuRays.cc b/ogre/src/OgreGpuRays.cc
@@ -16,7 +16,6 @@
 */
 
 #include <gz/common/Mesh.hh>
-#include <gz/common/MeshManager.hh>
 #include <gz/common/SubMesh.hh>
 
 #include <gz/math/Color.hh>
@@ -203,6 +202,12 @@ void OgreGpuRays::Destroy()
     this->dataPtr->orthoCam = nullptr;
   }
 
+  if (this->dataPtr->undistMesh)
+  {
+    delete this->dataPtr->undistMesh;
+    this->dataPtr->undistMesh = nullptr;
+  }
+
   this->dataPtr->visual.reset();
   this->dataPtr->texIdx.clear();
   this->dataPtr->texCount = 0u;
@@ -886,8 +891,6 @@ void OgreGpuRays::CreateMesh()
   mesh->AddSubMesh(*submesh);
 
   this->dataPtr->undistMesh = mesh;
-
-  common::MeshManager::Instance()->AddMesh(this->dataPtr->undistMesh);
 }
 
 /////////////////////////////////////////////////