Merge pull request #27 from MicroscopeIT/marekz/logging-on-holo

Fixed loading asset bundles on Hololens + added logging
tooploox · May 23, 2019 · dbd6a99 · dbd6a99
2 parents 02ac8af + c592a1f
commit dbd6a99
Show file tree

Hide file tree

Showing 7 changed files with 2,114 additions and 2,095 deletions.
diff --git a/unity/Holo/Assets/HoloToolkit/Input/Materials/hand_up.mat b/unity/Holo/Assets/HoloToolkit/Input/Materials/hand_up.mat
@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: hand_up
-  m_Shader: {fileID: 4800000, guid: 51c87b08c4bd5cd4eabce20953fbe2e7, type: 3}
+  m_Shader: {fileID: 4800000, guid: 17b35d8a8e5e92d4ebcf1933bf853497, type: 3}
   m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0