From 75f33874124dde5c810a8b2d94da422a73bb458c Mon Sep 17 00:00:00 2001 From: AbstractConcept Date: Fri, 2 Aug 2024 23:00:41 -0500 Subject: [PATCH] Fixed pawn offsets in portraits during animations --- 1.5/Assemblies/Rimworld-Animations.dll | Bin 58880 -> 58880 bytes .../PawnRenderSubWorker_ChangeOffset.cs | 3 +++ 2 files changed, 3 insertions(+) diff --git a/1.5/Assemblies/Rimworld-Animations.dll b/1.5/Assemblies/Rimworld-Animations.dll index 8cd47b386a08cee696a4cf028515d37cdc5e6cff..4cf85bf0e4f24cf45254e39f77967bd266e848f5 100644 GIT binary patch delta 4407 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 diff --git a/1.5/Source/RenderSubWorkers/PawnRenderSubWorker_ChangeOffset.cs b/1.5/Source/RenderSubWorkers/PawnRenderSubWorker_ChangeOffset.cs index 035da95..4e64eb5 100644 --- a/1.5/Source/RenderSubWorkers/PawnRenderSubWorker_ChangeOffset.cs +++ b/1.5/Source/RenderSubWorkers/PawnRenderSubWorker_ChangeOffset.cs @@ -13,6 +13,9 @@ namespace Rimworld_Animations public override void TransformOffset(PawnRenderNode node, PawnDrawParms parms, ref Vector3 offset, ref Vector3 pivot) { + if (parms.Portrait) + return; + if (node.AnimationWorker is AnimationWorker_KeyframesExtended && node.tree.pawn.TryGetComp(out CompExtendedAnimator extendedAnimator)) {