From 7ad82861c5a7a236a5754113c60942ce54651a56 Mon Sep 17 00:00:00 2001
From: Ye Han <ye.han@kitware.com>
Date: Wed, 16 Dec 2020 15:55:53 -0500
Subject: [PATCH] BUG: Fix capsule rendering radius

---
 .../VTKRenderer/RenderDelegate/imstkVTKCapsuleRenderDelegate.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKCapsuleRenderDelegate.cpp b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKCapsuleRenderDelegate.cpp
index e992620a4..f3df5c69a 100644
--- a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKCapsuleRenderDelegate.cpp
+++ b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKCapsuleRenderDelegate.cpp
@@ -34,6 +34,7 @@ VTKCapsuleRenderDelegate::VTKCapsuleRenderDelegate(std::shared_ptr<VisualModel>
 {
     auto geometry = std::static_pointer_cast<Capsule>(visualModel->getGeometry());
 
+<<<<<<< HEAD
     m_capsuleSource = vtkSmartPointer<vtkCapsuleSource>::New();
     m_capsuleSource->SetRadius(geometry->getRadius());
     m_capsuleSource->SetCylinderLength(geometry->getLength());
-- 
GitLab