Merge pull request #55 from PuddingVR/master

Fixed avatar flickering in third person in some worlds

Author: RequiDev

ReModCE/Components/ThirdPersonComponent.cs

@@ -19,6 +19,7 @@ internal class ThirdPersonComponent : ModComponent
         private Camera _cameraBack;
         private Camera _cameraFront;
         private Camera _referenceCamera;
+        private Camera _photoCamera;
 
         private ThirdPersonMode _cameraSetup;
 
@@ -49,6 +50,7 @@ public override void OnUiManagerInit(UiManager uiManager)
             _hotkeyToggle = hotkeyMenu.AddToggle("Thirdperson Hotkey", "Enable/Disable thirdperson hotkey", EnableThirdpersonHotkey.SetValue, EnableThirdpersonHotkey);
 
             var cameraObject = GameObject.Find("Camera (eye)");
+            _photoCamera = GameObject.Find("UserCamera")?.transform.Find("PhotoCamera")?.GetComponent<Camera>();
 
             if (cameraObject == null)
             {
@@ -59,7 +61,7 @@ public override void OnUiManagerInit(UiManager uiManager)
                     return;
                 }
             }
-
+            
             _referenceCamera = cameraObject.GetComponent<Camera>();
             if (_referenceCamera == null)
                 return;
@@ -82,6 +84,9 @@ private Camera CreateCamera(ThirdPersonMode cameraType, Vector3 rotation, float
             camera.fieldOfView = fieldOfView;
             camera.nearClipPlane /= 4f;
 
+            if(_photoCamera != null)
+                camera.cullingMask = _photoCamera.cullingMask;
+
             return camera;
         }