v3.0.2 fixes NRE with modded content (like vehicle framework)

pardeike · May 12, 2024 · f325b24 · f325b24
1 parent 7e459ca
commit f325b24
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/1.5/Assemblies/CameraPlus.dll b/1.5/Assemblies/CameraPlus.dll
diff --git a/About/About.xml b/About/About.xml
@@ -19,7 +19,7 @@
     </li>
   </modDependencies>
   <packageId>brrainz.cameraplus</packageId>
-  <modVersion>3.0.1.0</modVersion>
+  <modVersion>3.0.2.0</modVersion>
   <steamAppId>867467808</steamAppId>
   <url>https://github.com/pardeike/CameraPlus</url>
   <description>You want more zoom and different paning?

diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
   <identifier>net.pardeike.rimworld.mod.cameraplus</identifier>
-  <version>3.0.1.0</version>
+  <version>3.0.2.0</version>
   <targetVersions>
     <li>1.0.0</li>
     <li>1.1.0</li>

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,7 +3,7 @@
 		<ModName>Camera+</ModName>
 		<ModFileName>CameraPlus</ModFileName>
 		<Repository>https://github.com/pardeike/CameraPlus</Repository>
-		<ModVersion>3.0.1.0</ModVersion>
+		<ModVersion>3.0.2.0</ModVersion>
 		<ProjectGuid>{AC5EE7A1-16EA-498D-B21A-83ACF78F0E5A}</ProjectGuid>
 	</PropertyGroup>
 </Project>
diff --git a/Source/DotTools.cs b/Source/DotTools.cs
@@ -148,8 +148,8 @@ static void DrawMarker(Pawn pawn, Material materialMarker)
 			var q = pawn.Downed ? downedRotation : Quaternion.identity;
 			var posMarker = pawn.Drawer.renderer.GetBodyPos(pawn.DrawPos, pawn.GetPosture(), out _);
 			_ = pawn.Drawer.renderer.renderTree.nodesByTag.TryGetValue(PawnRenderNodeTagDefOf.Body, out var bodyNode);
-			var drawSize = (bodyNode.Graphic.drawSize.x + bodyNode.Graphic.drawSize.y) / 2;
-			var matrixMarker = Matrix4x4.TRS(posMarker, q, Vector3.one * Mathf.Pow(drawSize, 1 / markerSizeScaler) * markerScale * Settings.dotRelativeSize);
+			var size = (bodyNode?.Graphic ?? pawn.Graphic)?.drawSize ?? pawn.DrawSize;
+			var matrixMarker = Matrix4x4.TRS(posMarker, q, Vector3.one * Mathf.Pow((size.x + size.y) / 2, 1 / markerSizeScaler) * markerScale * Settings.dotRelativeSize);
 			var mesh = pawn.Rotation == Rot4.West ? meshWest : meshEast;
 			Graphics.DrawMesh(mesh, matrixMarker, materialMarker, 0);
 		}