Fix crash that was occurring when scales and orientations were not sp…

…ecified. Fixes #239 (Internal change: 1767291)
PixarAnimationStudios · Jul 25, 2017 · 9746195 · 9746195
1 parent 0516c16
commit 9746195
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/third_party/katana/plugin/pxrUsdInShipped/pointInstancerUtils.cpp b/third_party/katana/plugin/pxrUsdInShipped/pointInstancerUtils.cpp
@@ -78,7 +78,8 @@ PxrUsdInShipped_PointInstancerUtils::ComputeInstanceTransformsAtTime(
         std::vector<GfMatrix4d> &curr = xforms[a];
         curr.reserve(numInstances);
 
-        // Get sample-dependent values. Stop if topology differs.
+        // Get sample-dependent values. Stop if topology differs, but permit
+        // unspecified scales and orientations.
         positionsAttr.Get(&positions, sampleTimes[a]);
         if (positions.size() != numInstances) {
             break;
@@ -95,8 +96,12 @@ PxrUsdInShipped_PointInstancerUtils::ComputeInstanceTransformsAtTime(
         for (auto i = decltype(numInstances){0}; i < numInstances; ++i) {
             GfTransform transform;
             transform.SetTranslation(positions[i]);
-            transform.SetScale(scales[i]);
-            transform.SetRotation(GfRotation(orientations[i]));
+            if (scales.size() > 0) {
+                transform.SetScale(scales[i]);
+            }
+            if (orientations.size() > 0) {
+                transform.SetRotation(GfRotation(orientations[i]));
+            }
             curr.push_back(transform.GetMatrix());
         }