Skip to content

Commit 7712732

Browse files
MeshAlgoResample : Clarify namespace of IECoreScene::Detail
Referring to things in the IECoreScene::Detail namespace as simply Detail works only if there is nothing in the namespace IECoreScene::MeshAlgo::Detail, which doesn't seem like a safe assumption?
1 parent e5c1576 commit 7712732

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/IECoreScene/MeshAlgoResample.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -321,15 +321,15 @@ void IECoreScene::MeshAlgo::resamplePrimitiveVariable( const MeshPrimitive *mesh
321321
// average array to single value
322322
if ( interpolation == PrimitiveVariable::Constant )
323323
{
324-
Detail::AverageValueFromVector fn;
324+
IECoreScene::Detail::AverageValueFromVector fn;
325325
dstData = dispatch( srcData.get(), fn );
326326
primitiveVariable = PrimitiveVariable( interpolation, dstData );
327327
return;
328328
}
329329

330330
if ( primitiveVariable.interpolation == PrimitiveVariable::Constant )
331331
{
332-
Detail::FillVectorFromValue fn( mesh->variableSize( interpolation ) );
332+
IECoreScene::Detail::FillVectorFromValue fn( mesh->variableSize( interpolation ) );
333333
DataPtr arrayData = dispatch( srcData.get(), fn );
334334
if (arrayData)
335335
{
@@ -343,25 +343,25 @@ void IECoreScene::MeshAlgo::resamplePrimitiveVariable( const MeshPrimitive *mesh
343343
if( srcInterpolation == PrimitiveVariable::Varying || srcInterpolation == PrimitiveVariable::Vertex )
344344
{
345345
MeshVertexToUniform fn( mesh, canceller );
346-
dstData = despatchTypedData<MeshVertexToUniform, Detail::IsArithmeticVectorTypedData>( srcData.get(), fn );
346+
dstData = despatchTypedData<MeshVertexToUniform, IECoreScene::Detail::IsArithmeticVectorTypedData>( srcData.get(), fn );
347347
}
348348
else if( srcInterpolation == PrimitiveVariable::FaceVarying )
349349
{
350350
MeshFaceVaryingToUniform fn( mesh, canceller );
351-
dstData = despatchTypedData<MeshFaceVaryingToUniform, Detail::IsArithmeticVectorTypedData>( srcData.get(), fn );
351+
dstData = despatchTypedData<MeshFaceVaryingToUniform, IECoreScene::Detail::IsArithmeticVectorTypedData>( srcData.get(), fn );
352352
}
353353
}
354354
else if( interpolation == PrimitiveVariable::Varying || interpolation == PrimitiveVariable::Vertex )
355355
{
356356
if( srcInterpolation == PrimitiveVariable::Uniform )
357357
{
358358
MeshUniformToVertex fn( mesh, canceller );
359-
dstData = despatchTypedData<MeshUniformToVertex, Detail::IsArithmeticVectorTypedData>( srcData.get(), fn );
359+
dstData = despatchTypedData<MeshUniformToVertex, IECoreScene::Detail::IsArithmeticVectorTypedData>( srcData.get(), fn );
360360
}
361361
else if( srcInterpolation == PrimitiveVariable::FaceVarying )
362362
{
363363
MeshFaceVaryingToVertex fn( mesh, canceller );
364-
dstData = despatchTypedData<MeshFaceVaryingToVertex, Detail::IsArithmeticVectorTypedData>( srcData.get(), fn );
364+
dstData = despatchTypedData<MeshFaceVaryingToVertex, IECoreScene::Detail::IsArithmeticVectorTypedData>( srcData.get(), fn );
365365
}
366366
else if( srcInterpolation == PrimitiveVariable::Varying || srcInterpolation == PrimitiveVariable::Vertex )
367367
{
@@ -371,7 +371,7 @@ void IECoreScene::MeshAlgo::resamplePrimitiveVariable( const MeshPrimitive *mesh
371371
else if( interpolation == PrimitiveVariable::FaceVarying )
372372
{
373373
MeshAnythingToFaceVarying fn( mesh, srcInterpolation, canceller );
374-
dstData = despatchTypedData<MeshAnythingToFaceVarying, Detail::IsArithmeticVectorTypedData>( srcData.get(), fn );
374+
dstData = despatchTypedData<MeshAnythingToFaceVarying, IECoreScene::Detail::IsArithmeticVectorTypedData>( srcData.get(), fn );
375375
}
376376

377377
if( primitiveVariable.indices )

0 commit comments

Comments
 (0)