From 4b51e1ac70a9c44cd7638c770be95f2032665984 Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Mon, 10 Jun 2019 17:18:32 -0700 Subject: [PATCH] Fix body transform support and some cleaning up --- .../GameData/ReStock/Plugins/Restock.dll | Bin 25600 -> 25600 bytes Source/Restock/ModuleRestockDepthMask.cs | 61 +++++++++--------- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll b/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll index bb2c9bb347b8d3c24a7a82fe600f810b056e2646..c072608e745032436f8a25ab0e75a04c6ed5d542 100644 GIT binary patch delta 7812 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 Y{}$^jeXW5TztCjmfY#vDkHB633uA)y>;M1& delta 7767 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 z(); - + var windowRenderer = maskTransformObject.GetComponent(); windowRenderer.material.shader = depthShader; windowRenderer.material.renderQueue = maskRenderQueue; - this.Log(depthShader.name); - this.Log(windowRenderer.material.shader.name); - - var meshRenderers = bodyRoot.GetComponentsInChildren(true); - var skinnedMeshRenderers = bodyRoot.GetComponentsInChildren(true); + var meshRenderers = bodyTransformObject.GetComponentsInChildren(true); + var skinnedMeshRenderers = bodyTransformObject.GetComponentsInChildren(true); foreach (var renderer in meshRenderers) { @@ -109,7 +112,7 @@ namespace Restock queue = meshRenderQueue + ((queue - 2000) / 2); renderer.material.renderQueue = queue; } - + foreach (var renderer in skinnedMeshRenderers) { if (renderer == windowRenderer) continue;