Merge pull request #1436 from johnhaddon/facevaryingSkinningFix

USD PrimitiveAlgo : Fix crash loading skinned facevarying normals

Author: johnhaddon

Changes

@@ -1,7 +1,10 @@
 10.5.x.x (relative to 10.5.9.4)
 ========
 
+Fixes
+-----
 
+- USDScene : Fixed crash loading skinned facevarying normals (bug introduced in 10.5.9.3).
 
 10.5.9.4 (relative to 10.5.9.3)
 ========

contrib/IECoreUSD/src/IECoreUSD/PrimitiveAlgo.cpp

@@ -351,7 +351,7 @@ bool computeFaceVaryingSkinnedNormals( pxr::UsdSkelSkinningQuery &skinningQuery,
 
 	Canceller::check( canceller );
 	pxr::VtArray<pxr::GfMatrix3d> invTransposeXforms( orderedXforms.size() );
-	for( size_t i = 0; i < xforms.size(); ++i )
+	for( size_t i = 0; i < orderedXforms.size(); ++i )
 	{
 		invTransposeXforms[i] = orderedXforms[i].ExtractRotationMatrix().GetInverse().GetTranspose();
 	}

contrib/IECoreUSD/test/IECoreUSD/data/skinnedFaceVaryingNormals.usda

@@ -2,6 +2,8 @@
 (
     defaultPrim = "main"
     metersPerUnit = 0.01
+    startTimeCode = 1
+    endTimeCode = 24
     upAxis = "Y"
 )
 
@@ -33,11 +35,11 @@ def SkelRoot "main" (
             interpolation = "vertex"
         )
         uniform token[] skel:joints = ["joint1"]
-        rel skel:skeleton = </main/joint1>
+        rel skel:skeleton = </main/skel>
         uniform token subdivisionScheme = "none"
     }
 
-    def Skeleton "joint1" (
+    def Skeleton "skel" (
         prepend apiSchemas = ["SkelBindingAPI"]
         customData = {
             dictionary Maya = {
@@ -46,10 +48,10 @@ def SkelRoot "main" (
         }
     )
     {
-        uniform matrix4d[] bindTransforms = [( (1, 0, 0, 0), (0, 1, 0, 0), (0, 0, 1, 0), (0, 0, 0, 1) )]
-        uniform token[] joints = ["joint1"]
-        uniform matrix4d[] restTransforms = [( (1, 0, 0, 0), (0, 1, 0, 0), (0, 0, 1, 0), (0, 0, 0, 1) )]
-        rel skel:animationSource = </main/joint1/anim>
+        uniform matrix4d[] bindTransforms = [( (1, 0, 0, 0), (0, 1, 0, 0), (0, 0, 1, 0), (0, 0, 0, 1) ), ( (1, 0, 0, 0), (0, 1, 0, 0), (0, 0, 1, 0), (0, 0, 0, 1) )]
+        uniform token[] joints = ["joint1", "joint2"]
+        uniform matrix4d[] restTransforms = [( (1, 0, 0, 0), (0, 1, 0, 0), (0, 0, 1, 0), (0, 0, 0, 1) ), ( (1, 0, 0, 0), (0, 1, 0, 0), (0, 0, 1, 0), (0, 0, 0, 1) )]
+        rel skel:animationSource = </main/skel/anim>
 
         def SkelAnimation "anim"
         {