Merge pull request #628 from Balint-H:feature/unity-mesh-import

PiperOrigin-RevId: 493556582
Change-Id: I26bac07a8fc996043ec478d0ec0c5b56fe447e50
This commit is contained in:
Copybara-Service
2022-12-07 03:18:38 -08:00
@@ -48,6 +48,12 @@ public class MjMeshFilter : MonoBehaviour {
throw new ArgumentException("Unsupported geom shape detected");
}
if(_geom.ShapeType == MjShapeComponent.ShapeTypes.Mesh) {
MjMeshShape meshShape = _geom.Shape as MjMeshShape;
_meshFilter.sharedMesh = meshShape.Mesh;
return;
}
DisposeCurrentMesh();
var mesh = new Mesh();
@@ -73,7 +79,7 @@ public class MjMeshFilter : MonoBehaviour {
// Dynamically created meshes with no references are only disposed automatically on scene changes.
// This prevents resource leaks in case the host environment doesn't reload scenes.
private void DisposeCurrentMesh() {
if (_meshFilter.sharedMesh != null) {
if (_meshFilter.sharedMesh != null && _geom.ShapeType != MjShapeComponent.ShapeTypes.Mesh) {
#if UNITY_EDITOR
DestroyImmediate(_meshFilter.sharedMesh);
#else