diff --git a/RecastDemo/Include/Sample.h b/RecastDemo/Include/Sample.h
index 63a2c094..64a76166 100644
--- a/RecastDemo/Include/Sample.h
+++ b/RecastDemo/Include/Sample.h
@@ -107,8 +107,10 @@ struct SampleToolState
 
 class Sample
 {
-protected:
+public:
 	InputGeom* inputGeometry = nullptr;
+
+protected:
 	dtNavMesh* navMesh = nullptr;
 	dtNavMeshQuery* navQuery = nullptr;
 	dtCrowd* crowd = nullptr;
@@ -173,7 +175,6 @@ public:
 	virtual void handleUpdate(float dt);
 	virtual void collectSettings(struct BuildSettings& settings);
 
-	virtual InputGeom* getInputGeom() { return inputGeometry; }
 	virtual dtNavMesh* getNavMesh() { return navMesh; }
 	virtual dtNavMeshQuery* getNavMeshQuery() { return navQuery; }
 	virtual dtCrowd* getCrowd() { return crowd; }
diff --git a/RecastDemo/Source/ConvexVolumeTool.cpp b/RecastDemo/Source/ConvexVolumeTool.cpp
index 46842db2..db84974f 100644
--- a/RecastDemo/Source/ConvexVolumeTool.cpp
+++ b/RecastDemo/Source/ConvexVolumeTool.cpp
@@ -166,7 +166,7 @@ void ConvexVolumeTool::handleClick(const float* /*s*/, const float* p, bool shif
 	{
 		return;
 	}
-	InputGeom* geom = sample->getInputGeom();
+	InputGeom* geom = sample->inputGeometry;
 	if (!geom)
 	{
 		return;
diff --git a/RecastDemo/Source/CrowdTool.cpp b/RecastDemo/Source/CrowdTool.cpp
index 17776492..e119d204 100644
--- a/RecastDemo/Source/CrowdTool.cpp
+++ b/RecastDemo/Source/CrowdTool.cpp
@@ -1148,7 +1148,7 @@ void CrowdTool::handleClick(const float* s, const float* p, bool shift)
 	{
 		return;
 	}
-	InputGeom* geom = sample->getInputGeom();
+	InputGeom* geom = sample->inputGeometry;
 	if (!geom)
 	{
 		return;
diff --git a/RecastDemo/Source/NavMeshPruneTool.cpp b/RecastDemo/Source/NavMeshPruneTool.cpp
index bf7ed55c..6b5fbed2 100644
--- a/RecastDemo/Source/NavMeshPruneTool.cpp
+++ b/RecastDemo/Source/NavMeshPruneTool.cpp
@@ -250,7 +250,7 @@ void NavMeshPruneTool::handleClick(const float* s, const float* p, bool shift)
 	{
 		return;
 	}
-	InputGeom* geom = sample->getInputGeom();
+	InputGeom* geom = sample->inputGeometry;
 	if (!geom)
 	{
 		return;
diff --git a/RecastDemo/Source/OffMeshConnectionTool.cpp b/RecastDemo/Source/OffMeshConnectionTool.cpp
index 1e66bd64..50ecba4e 100644
--- a/RecastDemo/Source/OffMeshConnectionTool.cpp
+++ b/RecastDemo/Source/OffMeshConnectionTool.cpp
@@ -73,7 +73,7 @@ void OffMeshConnectionTool::handleClick(const float* /*rayStartPos*/, const floa
 		return;
 	}
 
-	InputGeom* geom = sample->getInputGeom();
+	InputGeom* geom = sample->inputGeometry;
 	if (!geom)
 	{
 		return;
@@ -139,7 +139,7 @@ void OffMeshConnectionTool::handleRender()
 		duDebugDrawCross(&dd, hitPos[0], hitPos[1] + 0.1f, hitPos[2], sample->getAgentRadius(), duRGBA(0, 0, 0, 128), 2.0f);
 	}
 
-	if (InputGeom* geom = sample->getInputGeom())
+	if (InputGeom* geom = sample->inputGeometry)
 	{
 		geom->drawOffMeshConnections(&dd, true);
 	}
diff --git a/RecastDemo/Source/main.cpp b/RecastDemo/Source/main.cpp
index f728e617..c4895fd7 100644
--- a/RecastDemo/Source/main.cpp
+++ b/RecastDemo/Source/main.cpp
@@ -775,7 +775,7 @@ int main(int /*argc*/, char** /*argv*/)
 				app.inputGeometry = nullptr;
 
 				// Destroy the sample if it already had geometry loaded, as we've just deleted it!
-				if (app.sample && app.sample->getInputGeom())
+				if (app.sample && app.sample->inputGeometry)
 				{
 					delete app.sample;
 					app.sample = nullptr;