From d69db4ebadf6a80411acdced4b6802f9eedca4e6 Mon Sep 17 00:00:00 2001
From: Robert Beckebans <robert.beckebans@gmail.com>
Date: Mon, 6 Jun 2022 17:36:18 +0200
Subject: [PATCH] Fixed rebase conflicts

---
 neo/idlib/containers/List.h | 26 ++++++++++++++++++++++++++
 neo/renderer/Model_gltf.cpp |  4 +++-
 neo/renderer/Model_gltf.h   |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/neo/idlib/containers/List.h b/neo/idlib/containers/List.h
index 3d500b77..e81b2683 100644
--- a/neo/idlib/containers/List.h
+++ b/neo/idlib/containers/List.h
@@ -200,6 +200,32 @@ public:
 		memTag = ( byte )tag_;
 	};
 
+	struct Iterator
+	{
+		_type_* p;
+		_type_& operator*( )
+		{
+			return *p;
+		}
+		bool operator != ( const Iterator& rhs )
+		{
+			return p != rhs.p;
+		}
+		void operator ++( )
+		{
+			++p;
+		}
+	};
+
+	auto begin( ) const   // const version
+	{
+		return Iterator{list};
+	};
+	auto end( ) const   // const version
+	{
+		return Iterator{list + Num( )};
+	};
+
 private:
 	int				num;
 	int				size;
diff --git a/neo/renderer/Model_gltf.cpp b/neo/renderer/Model_gltf.cpp
index 23c40410..f682e03f 100644
--- a/neo/renderer/Model_gltf.cpp
+++ b/neo/renderer/Model_gltf.cpp
@@ -390,10 +390,12 @@ void idRenderModelGLTF::TouchData( )
 	common->Warning( "The method or operation is not implemented." );
 }
 
-void idRenderModelGLTF::CreateBuffers( nvrhi::ICommandList* commandList )
+/*
+void idRenderModelGLTF::CreateBuffers()
 {
 	common->Warning( "The method or operation is not implemented." );
 }
+*/
 
 void idRenderModelGLTF::InitEmpty( const char* name )
 {
diff --git a/neo/renderer/Model_gltf.h b/neo/renderer/Model_gltf.h
index 353c0d51..086b057f 100644
--- a/neo/renderer/Model_gltf.h
+++ b/neo/renderer/Model_gltf.h
@@ -33,7 +33,7 @@ public:
 	void SetLevelLoadReferenced( bool referenced ) override;
 	bool IsLevelLoadReferenced( ) override;
 	void TouchData( ) override;
-	void CreateBuffers( nvrhi::ICommandList* commandList ) override;
+	//void CreateBuffers( nvrhi::ICommandList* commandList ) override;
 	void InitEmpty( const char* name ) override;
 	void AddSurface( modelSurface_t surface ) override;
 	void FinishSurfaces( bool useMikktspace ) override;