Skip to content

Commit

Permalink
Fixed a critical bug in last version related to the reskinning features.
Browse files Browse the repository at this point in the history
  • Loading branch information
Joen-UnLogick committed Oct 4, 2015
1 parent fc3400f commit 5fd2faa
Showing 1 changed file with 15 additions and 14 deletions.
29 changes: 15 additions & 14 deletions UMAProject/Assets/Standard Assets/UMA/Core/Scripts/UMAMeshData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,18 @@ public void PrepareVertexBuffers(int size)
#endif
}

/// <summary>
/// Initialize UMA mesh data from Unity mesh.
/// </summary>
/// <param name="renderer">Source renderer.</param>
public void RetrieveDataFromUnityMesh(SkinnedMeshRenderer renderer)
{
RetrieveDataFromUnityMesh(renderer.sharedMesh);

UpdateBones(renderer.rootBone, renderer.bones);
}


/// <summary>
/// Initialize UMA mesh data from Unity mesh.
/// </summary>
Expand Down Expand Up @@ -346,31 +358,20 @@ public void RetrieveDataFromUnityMesh(Mesh sharedMesh)
}
}

/// <summary>
/// Initialize UMA mesh data from Unity mesh.
/// </summary>
/// <param name="renderer">Source renderer.</param>
public void RetrieveDataFromUnityMesh(SkinnedMeshRenderer renderer)
{
RetrieveDataFromUnityMesh(renderer.sharedMesh);

UpdateBones(renderer.rootBone, renderer.bones);
}

/// <summary>
/// Validates the skinned transform hierarchy.
/// </summary>
/// <param name="rootBone">Root transform.</param>
/// <param name="bones">Transforms.</param>
public void UpdateBones(Transform rootBone, Transform[] bones)
{
var storedRoot = rootBone;
var storedRootBone = rootBone;
while (rootBone.name != "Global")
{
rootBone = rootBone.parent;
if (rootBone == null)
{
rootBone = storedRoot;
rootBone = storedRootBone;
break;
}
}
Expand Down Expand Up @@ -456,7 +457,7 @@ public void ApplyDataToUnityMesh(SkinnedMeshRenderer renderer, UMASkeleton skele
}

mesh.RecalculateBounds();
renderer.bones = bones;// skeleton.HashesToTransforms(boneNameHashes);
renderer.bones = bones != null ? bones : skeleton.HashesToTransforms(boneNameHashes);
renderer.sharedMesh = mesh;
renderer.rootBone = rootBone;
}
Expand Down

0 comments on commit 5fd2faa

Please sign in to comment.