From 5574e8fa623f96ab1fb1ba8dc88023dee3bb5a41 Mon Sep 17 00:00:00 2001
From: doterop <daniel.oterop@gmail.com>
Date: Thu, 19 Nov 2020 14:06:10 +0100
Subject: [PATCH] Fixed ISM transform

---
 .../Plugins/Carla/Source/Carla/Util/ObjectRegister.cpp         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ObjectRegister.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ObjectRegister.cpp
index 7328bb8fe..2378f7f6a 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ObjectRegister.cpp
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/ObjectRegister.cpp
@@ -213,6 +213,7 @@ void UObjectRegister::RegisterISMComponents(AActor* Actor)
   for(UInstancedStaticMeshComponent* Comp : ISMComps)
   {
     const TArray<FInstancedStaticMeshInstanceData>& PerInstanceSMData = Comp->PerInstanceSMData;
+    const FTransform CompTransform = Comp->GetComponentTransform();
 
     TArray<FBoundingBox> BoundingBoxes;
     UBoundingBoxCalculator::GetISMBoundingBox(Comp, BoundingBoxes);
@@ -236,7 +237,7 @@ void UObjectRegister::RegisterISMComponents(AActor* Actor)
       uint64 InstanceId = CityHash64(TCHAR_TO_ANSI(*InstanceIdStr), InstanceIdStr.Len());
 
       FEnvironmentObject EnvironmentObject;
-      EnvironmentObject.Transform = InstanceTransform;
+      EnvironmentObject.Transform = InstanceTransform * CompTransform;
       EnvironmentObject.Id = InstanceId;
       EnvironmentObject.Name = InstanceName;
       EnvironmentObject.IdStr = InstanceIdStr;