Replaced HAPI_PartInfo::isCurve and HAPI_PartInfo::hasVolume with a n…

…ew HAPI_PartType enum and HAPI_PartInfo::type member.
sideeffects · May 21, 2015 · 8c471a5 · 8c471a5
1 parent 97916e4
commit 8c471a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CurveMeshInputNode.C b/CurveMeshInputNode.C
@@ -219,7 +219,7 @@ CurveMeshInputNode::compute(const MPlug& plug, MDataBlock& data)
     HAPI_PartInfo partInfo = HAPI_PartInfo_Create();
     partInfo.vertexCount = partInfo.pointCount = curveInfo.vertexCount;
     partInfo.faceCount = curveInfo.curveCount;
-    partInfo.isCurve = true;
+    partInfo.type = HAPI_PARTTYPE_CURVE;
     CHECK_HAPI( HAPI_SetPartInfo( myAssetId, 0, 0, &partInfo ) );
 
     CHECK_HAPI( HAPI_SetCurveInfo( myAssetId, 0, 0, 0, &curveInfo ) );

diff --git a/OutputGeometryPart.C b/OutputGeometryPart.C
@@ -169,7 +169,7 @@ OutputGeometryPart::update()
                 );
         Util::checkHAPIStatus(hstat);
 
-        if(myPartInfo.hasVolume)
+        if(myPartInfo.type == HAPI_PARTTYPE_VOLUME)
         {
             hstat = HAPI_GetVolumeInfo(
                     myAssetId, myObjectId, myGeoId, myPartId,
@@ -178,7 +178,7 @@ OutputGeometryPart::update()
             Util::checkHAPIStatus(hstat);
         }
 
-        if(myPartInfo.isCurve)
+        if(myPartInfo.type == HAPI_PARTTYPE_CURVE)
         {
             hstat = HAPI_GetCurveInfo(
                     myAssetId, myObjectId, myGeoId, myPartId,
@@ -368,7 +368,7 @@ OutputGeometryPart::compute(
 #if MAYA_API_VERSION >= 201400
         // Volume
         MDataHandle volumeHandle = handle.child(AssetNode::outputPartVolume);
-        if(myPartInfo.hasVolume)
+        if(myPartInfo.type == HAPI_PARTTYPE_VOLUME)
         {
             computeVolume(time, volumeHandle);
         }