Updates to usdGeom et al to deprecate UsdAttribute::HasAuthoredValueO…

…pinion() in favor of UsdAttribute::HasAuthoredValue() For details on why we do this, see change 1923544 (Internal change: 1924169)
ilpvfx · Dec 13, 2018 · b447c35 · b447c35
1 parent 6c3e3db
commit b447c35
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 15 deletions.
diff --git a/pxr/usd/lib/usdGeom/bboxCache.cpp b/pxr/usd/lib/usdGeom/bboxCache.cpp
@@ -1197,7 +1197,7 @@ UsdGeomBBoxCache::_ResolvePrim(_BBoxTask* task,
                 // For more information, see bugzilla #115735
 
                 bool primHasAuthoredPoints =
-                    pointBasedObj.GetPointsAttr().HasAuthoredValueOpinion();
+                    pointBasedObj.GetPointsAttr().HasAuthoredValue();
 
                 if (primHasAuthoredPoints) {
                     successGettingExtent = _ComputeExtent(boundableObj, &extent);

diff --git a/pxr/usd/lib/usdGeom/motionAPI.cpp b/pxr/usd/lib/usdGeom/motionAPI.cpp
@@ -166,7 +166,7 @@ float UsdGeomMotionAPI::ComputeVelocityScale(UsdTimeCode time) const
     while (prim != pseudoRoot){
         UsdAttribute vsAttr = 
             prim.GetAttribute(UsdGeomTokens->motionVelocityScale);
-        if (vsAttr.HasAuthoredValueOpinion() && 
+        if (vsAttr.HasAuthoredValue() && 
             vsAttr.Get(&velocityScale, time)){
             return velocityScale;
         }

diff --git a/pxr/usd/lib/usdGeom/pointInstancer.cpp b/pxr/usd/lib/usdGeom/pointInstancer.cpp
@@ -513,7 +513,8 @@ UsdGeomPointInstancer::VisAllIds(UsdTimeCode const &time) const
 {
     VtInt64Array invised(0);
 
-    if (GetInvisibleIdsAttr().HasAuthoredValueOpinion())
+    if (GetInvisibleIdsAttr().HasAuthoredValue())
+        // We _could_ just block the attr instead. Better?
         return CreateInvisibleIdsAttr().Set(invised, time);
 
     return true;

diff --git a/pxr/usd/lib/usdGeom/primvar.cpp b/pxr/usd/lib/usdGeom/primvar.cpp
@@ -267,11 +267,7 @@ UsdGeomPrimvar::GetIndices(VtIntArray *indices,
 bool 
 UsdGeomPrimvar::IsIndexed() const
 {
-    UsdResolveInfo valueSource = _GetIndicesAttr(/*create*/ false).
-        GetResolveInfo(UsdTimeCode::EarliestTime());
-
-    return (valueSource.HasAuthoredValueOpinion() && 
-            !valueSource.ValueIsBlocked());
+    return _GetIndicesAttr(/*create*/ false).HasAuthoredValue();
 }
 
 bool 

diff --git a/pxr/usd/lib/usdGeom/testenv/testUsdGeomSchemata.py b/pxr/usd/lib/usdGeom/testenv/testUsdGeomSchemata.py
@@ -240,7 +240,7 @@ def test_Fallbacks(self):
 
         xform = UsdGeom.Xform.Define(stage, "/Xform")  # direct subclass
         xformOpOrder = xform.GetXformOpOrderAttr()
-        self.assertFalse(xformOpOrder.HasAuthoredValueOpinion())
+        self.assertFalse(xformOpOrder.HasAuthoredValue())
         # xformOpOrder has no fallback value
         self.assertEqual(xformOpOrder.Get(), None)
         self.assertFalse(xformOpOrder.HasFallbackValue())
@@ -252,11 +252,11 @@ def test_Fallbacks(self):
 
         opOrderVal = ["xformOp:transform"]
         self.assertTrue(xformOpOrderAttr.Set(opOrderVal))
-        self.assertTrue(xformOpOrderAttr.HasAuthoredValueOpinion())
+        self.assertTrue(xformOpOrderAttr.HasAuthoredValue())
 
         self.assertNotEqual(xformOpOrderAttr.Get(), None)
         self.assertTrue(xformOpOrderAttr.Clear())
-        self.assertFalse(xformOpOrderAttr.HasAuthoredValueOpinion())
+        self.assertFalse(xformOpOrderAttr.HasAuthoredValue())
         self.assertEqual(xformOpOrderAttr.Get(), None)
         self.assertFalse(xformOpOrder.HasFallbackValue())
 
@@ -271,14 +271,14 @@ def test_Fallbacks(self):
         # scenarios
         # Number 1: Sparse and non-sparse authoring on def'd prim
         mesh.CreateDoubleSidedAttr(False, True)
-        self.assertFalse(mesh.GetDoubleSidedAttr().HasAuthoredValueOpinion())
+        self.assertFalse(mesh.GetDoubleSidedAttr().HasAuthoredValue())
         mesh.CreateDoubleSidedAttr(False, False)
-        self.assertTrue(mesh.GetDoubleSidedAttr().HasAuthoredValueOpinion())
+        self.assertTrue(mesh.GetDoubleSidedAttr().HasAuthoredValue())
 
         # Number 2: Sparse authoring demotes to dense for non-defed prim
         overMesh = UsdGeom.Mesh(stage.OverridePrim('/overMesh'))
         overMesh.CreateDoubleSidedAttr(False, True)
-        self.assertTrue(overMesh.GetDoubleSidedAttr().HasAuthoredValueOpinion())
+        self.assertTrue(overMesh.GetDoubleSidedAttr().HasAuthoredValue())
         self.assertEqual(overMesh.GetDoubleSidedAttr().Get(), False)
         overMesh.CreateDoubleSidedAttr(True, True)
         self.assertEqual(overMesh.GetDoubleSidedAttr().Get(), True)

diff --git a/pxr/usd/lib/usdGeom/xformable.cpp b/pxr/usd/lib/usdGeom/xformable.cpp
@@ -173,7 +173,7 @@ UsdGeomXformable::_GetXformOpOrderValue(
         return false;
 
     if (hasAuthoredValue)
-        *hasAuthoredValue = xformOpOrderAttr.HasAuthoredValueOpinion();
+        *hasAuthoredValue = xformOpOrderAttr.HasAuthoredValue();
 
     xformOpOrderAttr.Get(xformOpOrder, UsdTimeCode::Default());
     return true;