Merge pull request #2691 from aaye/dev_pr_dll_importexport

Fix for DLL export import mismatch (Internal change: 2326679)
PixarAnimationStudios · May 10, 2024 · 2d035b5 · 2d035b5
2 parents fc9bc1d + e89c7b5
commit 2d035b5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/pxr/usdImaging/usdSkelImaging/skeletonAdapter.h b/pxr/usdImaging/usdSkelImaging/skeletonAdapter.h
@@ -209,20 +209,22 @@ class UsdSkelImagingSkeletonAdapter : public UsdImagingInstanceablePrimAdapter
                             const UsdImagingInstancerContext *instancerContext) 
                                         const override;
 
+    USDSKELIMAGING_API
     HdExtComputationOutputDescriptorVector
     GetExtComputationOutputs(UsdPrim const& prim,
                              SdfPath const& cachePath,
                              const UsdImagingInstancerContext* instancerContext)
                                     const override;
 
+    USDSKELIMAGING_API
     HdExtComputationPrimvarDescriptorVector
     GetExtComputationPrimvars(
             UsdPrim const& prim,
             SdfPath const& cachePath,
             HdInterpolation interpolation,
             const UsdImagingInstancerContext* instancerContext) const override;
 
-    USDIMAGING_API
+    USDSKELIMAGING_API
     VtValue 
     GetExtComputationInput(
             UsdPrim const& prim,
@@ -231,7 +233,7 @@ class UsdSkelImagingSkeletonAdapter : public UsdImagingInstanceablePrimAdapter
             UsdTimeCode time,
             const UsdImagingInstancerContext* instancerContext) const override;
 
-    USDIMAGING_API
+    USDSKELIMAGING_API
     size_t
     SampleExtComputationInput(
             UsdPrim const& prim,
@@ -243,7 +245,7 @@ class UsdSkelImagingSkeletonAdapter : public UsdImagingInstanceablePrimAdapter
             float *sampleTimes,
             VtValue *sampleValues) override;
 
-    USDIMAGING_API
+    USDSKELIMAGING_API
     std::string 
     GetExtComputationKernel(
             UsdPrim const& prim,

diff --git a/pxr/usdImaging/usdVolImaging/field3dAssetAdapter.h b/pxr/usdImaging/usdVolImaging/field3dAssetAdapter.h
@@ -54,14 +54,14 @@ class UsdImagingField3DAssetAdapter : public UsdImagingFieldAdapter {
     /// \name Scene Index Support
     // ---------------------------------------------------------------------- //
 
-    USDIMAGING_API
+    USDVOLIMAGING_API
     TfTokenVector GetImagingSubprims(UsdPrim const& prim) override;
 
-    USDIMAGING_API
+    USDVOLIMAGING_API
     TfToken GetImagingSubprimType(UsdPrim const& prim, TfToken const& subprim)
         override;
 
-    USDIMAGING_API
+    USDVOLIMAGING_API
     HdContainerDataSourceHandle GetImagingSubprimData(
             UsdPrim const& prim,
             TfToken const& subprim,

diff --git a/pxr/usdImaging/usdVolImaging/openvdbAssetAdapter.h b/pxr/usdImaging/usdVolImaging/openvdbAssetAdapter.h
@@ -54,14 +54,14 @@ class UsdImagingOpenVDBAssetAdapter : public UsdImagingFieldAdapter {
     /// \name Scene Index Support
     // ---------------------------------------------------------------------- //
 
-    USDIMAGING_API
+    USDVOLIMAGING_API
     TfTokenVector GetImagingSubprims(UsdPrim const& prim) override;
 
-    USDIMAGING_API
+    USDVOLIMAGING_API
     TfToken GetImagingSubprimType(UsdPrim const& prim, TfToken const& subprim)
         override;
 
-    USDIMAGING_API
+    USDVOLIMAGING_API
     HdContainerDataSourceHandle GetImagingSubprimData(
             UsdPrim const& prim,
             TfToken const& subprim,