Merge pull request #979 from Autodesk/chenh/MAYA-108273/support-color…

…-consolidation-for-usdpreviewsurface-and-primvarreader_color Use color consolidation support for UsdPreviewSurface and UsdPrimvarReader_color
Autodesk · Dec 14, 2020 · db7442e · db7442e
2 parents 870790e + 2fbd187
commit db7442e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/mayaUsd/render/vp2ShaderFragments/UsdPreviewSurface.xml b/lib/mayaUsd/render/vp2ShaderFragments/UsdPreviewSurface.xml
@@ -83,7 +83,7 @@ limitations under the License.
         <!-- UsdPreviewSurface Parameters -->
         <float name="clearcoat" ref="usdPreviewSurfaceLighting.clearcoatAmount"/>
         <float name="clearcoatRoughness" ref="usdPreviewSurfaceLighting.clearcoatRoughness"/>
-        <float3 name="diffuseColor" ref="diffuseColorPassThrough.input"/>
+        <float3 name="diffuseColor" ref="diffuseColorPassThrough.input" flags="multiDraw"/>
         <float3 name="emissiveColor" ref="usdPreviewSurfaceCombiner.emissiveColor"/>
         <float name="ior" ref="usdPreviewSurfaceLighting.ior"/>
         <float name="metallic" ref="usdPreviewSurfaceLighting.metallic"/>

diff --git a/lib/mayaUsd/render/vp2ShaderFragments/UsdPrimvarReader_color.xml b/lib/mayaUsd/render/vp2ShaderFragments/UsdPrimvarReader_color.xml
@@ -20,7 +20,7 @@ limitations under the License.
         <![CDATA[VP2 implementation for color/opacity reader]]>
     </description>
     <properties>
-        <float4 name="color" semantic="fcolor" flags="varyingInputParam" />
+        <float4 name="diffuseColor" semantic="fcolor" flags="varyingInputParam,multiDraw" />
     </properties>
     <outputs>
         <float4 name="output" />