fixup! VisualiserTool : VertexLabel mode

GafferHQ · Jan 23, 2025 · 398f9a3 · 398f9a3
1 parent 501c26a
commit 398f9a3
Showing 1 changed file with 16 additions and 43 deletions.
diff --git a/src/GafferSceneUI/VisualiserTool.cpp b/src/GafferSceneUI/VisualiserTool.cpp
@@ -998,57 +998,30 @@ class VisualiserGadget : public Gadget
 
 				if( dataName != g_vertexIndexDataName )
 				{
-					auto vIt = primitive->variables.find( primitiveVariableName );
-					if( vIt == primitive->variables.end() )
+					vData = primitive->expandedVariableData<Data>(
+						primitiveVariableName,
+						IECoreScene::PrimitiveVariable::Vertex,
+						false /* throwIfInvalid */
+					);
+
+					if( !vData )
 					{
 						continue;
 					}
-					if( mode == VisualiserTool::Mode::Auto && vIt->second.data->typeId() != IntVectorDataTypeId )
+
+					if( mode == VisualiserTool::Mode::Auto && vData->typeId() != IntVectorDataTypeId )
 					{
 						// Will be handled by `renderColorVisualiser()` instead.
 						continue;
 					}
 
-					switch( vIt->second.data->typeId() )
-					{
-						case IntVectorDataTypeId :
-							vData = primitive->expandedVariableData<IntVectorData>(
-								primitiveVariableName,
-								IECoreScene::PrimitiveVariable::Vertex,
-								false /* throwIfInvalid */
-							);
-							break;
-						case FloatVectorDataTypeId :
-							vData = primitive->expandedVariableData<FloatVectorData>(
-								primitiveVariableName,
-								IECoreScene::PrimitiveVariable::Vertex,
-								false /* throwIfInvalid */
-							);
-							break;
-						case V2fVectorDataTypeId :
-							vData = primitive->expandedVariableData<V2fVectorData>(
-								primitiveVariableName,
-								IECoreScene::PrimitiveVariable::Vertex,
-								false /* throwIfInvalid */
-							);
-							break;
-						case V3fVectorDataTypeId :
-							vData = primitive->expandedVariableData<V3fVectorData>(
-								primitiveVariableName,
-								IECoreScene::PrimitiveVariable::Vertex,
-								false /* throwIfInvalid */
-							);
-							break;
-						case Color3fVectorDataTypeId :
-							vData = primitive->expandedVariableData<Color3fVectorData>(
-								primitiveVariableName,
-								IECoreScene::PrimitiveVariable::Vertex,
-								false /* throwIfInvalid */
-							);
-							break;
-						default : break;
-					}
-					if( !vData )
+					if(
+						vData->typeId() != IntVectorDataTypeId &&
+						vData->typeId() != FloatVectorDataTypeId &&
+						vData->typeId() != V2fVectorDataTypeId &&
+						vData->typeId() != V3fVectorDataTypeId &&
+						vData->typeId() != Color3fVectorDataTypeId
+					)
 					{
 						continue;
 					}