Remove unused hitMode field from HdxPickTaskContextParams.

(Internal change: 2099964)
PixarAnimationStudios · Sep 29, 2020 · 722bbab · 722bbab
1 parent b010346
commit 722bbab
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/pxr/imaging/hdx/pickTask.cpp b/pxr/imaging/hdx/pickTask.cpp
@@ -964,7 +964,6 @@ operator==(HdxPickTaskContextParams const& lhs,
         rhsDepthMaskPtr ? *rhsDepthMaskPtr : nullptr;
 
     return lhs.resolution == rhs.resolution
-        && lhs.hitMode == rhs.hitMode
         && lhs.pickTarget == rhs.pickTarget
         && lhs.resolveMode == rhs.resolveMode
         && lhs.doUnpickablesOcclude == rhs.doUnpickablesOcclude
@@ -994,7 +993,6 @@ operator<<(std::ostream& out, HdxPickTaskContextParams const& p)
 
     out << "PickTask Context Params: (...) "
         << p.resolution << " "
-        << p.hitMode << " "
         << p.pickTarget << " "
         << p.resolveMode << " "
         << p.doUnpickablesOcclude << " "

diff --git a/pxr/imaging/hdx/pickTask.h b/pxr/imaging/hdx/pickTask.h
@@ -52,10 +52,6 @@ PXR_NAMESPACE_OPEN_SCOPE
     /* Task context */               \
     (pickParams)                     \
                                      \
-    /* Hit mode */                   \
-    (hitFirst)                       \
-    (hitAll)                         \
-                                     \
     /* Pick target */                \
     (pickPrimsAndInstances)          \
     (pickFaces)                      \
@@ -122,7 +118,6 @@ struct HdxPickTaskContextParams
 
     HdxPickTaskContextParams()
         : resolution(128, 128)
-        , hitMode(HdxPickTokens->hitFirst)
         , pickTarget(HdxPickTokens->pickPrimsAndInstances)
         , resolveMode(HdxPickTokens->resolveNearestToCamera)
         , doUnpickablesOcclude(false)
@@ -135,7 +130,6 @@ struct HdxPickTaskContextParams
     {}
 
     GfVec2i resolution;
-    TfToken hitMode;
     TfToken pickTarget;
     TfToken resolveMode;
     bool doUnpickablesOcclude;