Merge branch 'master' of ousttrue.sakura.ne.jp:work/_ghe/UniVRM

This commit is contained in:
ousttrue
2018-04-19 14:59:04 +09:00
2 changed files with 14 additions and 2 deletions

View File

@@ -71,6 +71,10 @@ namespace VRM
var mesh = new Mesh();
mesh.name = src.name + "(erased)";
#if UNITY_2017_3_OR_NEWER
mesh.indexFormat = src.indexFormat;
#endif
mesh.vertices = src.vertices;
mesh.normals = src.normals;
mesh.uv = src.uv;

View File

@@ -132,7 +132,9 @@ namespace VRM
// SkinnedMesh
//
var srcRenderer = src.GetComponent<SkinnedMeshRenderer>();
if (srcRenderer != null && srcRenderer.enabled)
if (srcRenderer != null && srcRenderer.enabled
&& srcRenderer.sharedMesh!=null
&& srcRenderer.sharedMesh.vertexCount>0)
{
// clear blendShape
var srcMesh = srcRenderer.sharedMesh;
@@ -143,6 +145,10 @@ namespace VRM
var mesh = new Mesh();
mesh.name = srcMesh.name + ".baked";
#if UNITY_2017_3_OR_NEWER
mesh.indexFormat = srcMesh.indexFormat;
#endif
srcRenderer.BakeMesh(mesh);
//var m = src.localToWorldMatrix;
@@ -281,7 +287,9 @@ namespace VRM
// not SkinnedMesh
//
var srcFilter = src.GetComponent<MeshFilter>();
if (srcFilter != null)
if (srcFilter != null
&& srcFilter.sharedMesh!=null
&& srcFilter.sharedMesh.vertexCount>0)
{
var srcRenderer = src.GetComponent<MeshRenderer>();
if (srcRenderer!=null && srcRenderer.enabled)