Merge branch 'TEST' of http://git.eseb.ovh:3006/Panic.ensemble/MegaBagar into TEST

# Conflicts:
#	FreeCam/Assets/BlockSpawner.cs
#	FreeCam/Assets/Effects/wMaillageShader.shader
#	FreeCam/Assets/Effects/wMaillageShader.shader.meta
#	FreeCam/Assets/Materials/New Material.mat

FreeCam/Assets/BlockSpawner.cs

@@ -32,7 +32,6 @@ public class BlockSpawner : MonoBehaviour
     public Shader previewShader;
     private GameObject _blockInstance;
 
-
     private bool _isPreview = false;
     private Shader _initialShader;
 
@@ -111,6 +110,7 @@ public class BlockSpawner : MonoBehaviour
         _isPreview = false;
     }
 
+
     private void SwitchToMeshRender()
     {
         MeshRenderer vRenderer = _blockInstance.GetComponent<MeshRenderer>();

FreeCam/Assets/BlockSpawner.cs.meta

@@ -3,7 +3,7 @@ guid: b78dfde35e58d1e4c858653eaf06ea64
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
-  defaultReferences:
+  defaultReferences: []
   - _blockToPlace: {instanceID: 0}
   - previewShader: {fileID: 4800000, guid: 167cdc0b24acc2f449b7fb1756fbc873, type: 3}
   executionOrder: 0

FreeCam/Assets/Materials/New Material.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: New Material
-  m_Shader: {fileID: 4800000, guid: 167cdc0b24acc2f449b7fb1756fbc873, type: 3}
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: 
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -40,7 +40,7 @@ Material:
         m_Scale: {x: 0.85, y: 0.85}
         m_Offset: {x: 0.075, y: 0.075}
     - _MainTex:
-        m_Texture: {fileID: 10305, guid: 0000000000000000f000000000000000, type: 0}
+        m_Texture: {fileID: 10906, guid: 0000000000000000f000000000000000, type: 0}
         m_Scale: {x: 0.85, y: 0.85}
         m_Offset: {x: 0.075, y: 0.075}
     - _MetallicGlossMap:
@@ -67,18 +67,12 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _RimPower: 0.91
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
-    - _Threshold: 0.01
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 0.42955682, g: 0.4301132, b: 0.46226418, a: 1}
-    - _EdgeColor: {r: 1, g: 0, b: 0, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _InnerColor: {r: 0, g: 0, b: 0, a: 1}
-    - _MainTex: {r: 0.5, g: 0.5, b: 1, a: 1}
-    - _RimColor: {r: 1, g: 1, b: 1, a: 1}
   m_BuildTextureStacks: []

FreeCam/Assets/Scenes/SampleScene.unity

@@ -688,9 +688,5 @@ PrefabInstance:
       propertyPath: _blockToPlace
       value: 
       objectReference: {fileID: 3300812737117657924, guid: 7b30a4c90d614f747872471cf43b8e56, type: 3}
-    - target: {fileID: 6193258497320629589, guid: 37333bbc22b455449a05fcf8aa6b9a8f, type: 3}
-      propertyPath: previewShader
-      value: 
-      objectReference: {fileID: 4800000, guid: 167cdc0b24acc2f449b7fb1756fbc873, type: 3}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 37333bbc22b455449a05fcf8aa6b9a8f, type: 3}