USD: Add a test case to confirm that value blocks will

also block time samples. (Internal change: 2034494)
PixarAnimationStudios · Jan 29, 2020 · eb0914b · eb0914b
1 parent 85090d0
commit eb0914b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/pxr/usd/usd/testenv/testUsdFlattenLayerStack.py b/pxr/usd/usd/testenv/testUsdFlattenLayerStack.py
@@ -254,6 +254,15 @@ def replaceWithFoo(layer, s):
  b = prim.GetAttribute('b')
  self.assertEqual(b.Get(), None)
 
+ # a value block will block both defaults and time samples
+ c = prim.GetAttribute('c')
+ self.assertEqual(c.Get(), None)
+ self.assertEqual(c.Get(1), None)
+
+ # strong time samples will override a weaker value block
+ d = prim.GetAttribute('d')
+ self.assertEqual(d.Get(1), 789)
+
 if __name__=="__main__":
  # Register test plugin defining timecode metadata fields.
  testDir = os.path.abspath(os.getcwd())

diff --git a/pxr/usd/usd/testenv/testUsdFlattenLayerStack/valueBlocks_strong.usda b/pxr/usd/usd/testenv/testUsdFlattenLayerStack/valueBlocks_strong.usda
@@ -4,4 +4,9 @@ over "Human"
 {
  int[] a = [1]
  int[] b = None
+ int c = None
+ int d.timeSamples = {
+ 0: 456,
+ 1: 789
+ }
 }
diff --git a/pxr/usd/usd/testenv/testUsdFlattenLayerStack/valueBlocks_weak.usda b/pxr/usd/usd/testenv/testUsdFlattenLayerStack/valueBlocks_weak.usda
@@ -6,4 +6,10 @@ def Xform "Human" (
 {
  int[] a = None
  int[] b = [1]
+ int c = 123
+ int c.timeSamples = {
+ 0: 456,
+ 1: 789
+ }
+ int d = None
 }