Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-08-14 c6689f941359227f0b99b20b9400ccbab81b671c

 Core/LightingMap/PrefabLightmapData.cs

@@ -44,7 +44,7 @@
                if (tmpMaterialArray[j].shader.name.Contains("T4M 4 Textures")) {
                    Shader tmpShader = Shader.Find("T4MShaders/ShaderModel2/Diffuse/T4M 4 Textures");
                    if (tmpShader == null) {
                        DesignDebug.Log("tmpShader is Null");
                        DebugEx.Log("tmpShader is Null");
                        continue;
                    }
                    tmpMaterialArray[j].shader = tmpShader;