Resolve conflicts with master

1 files changed, 7 insertions, 4 deletions

diff --git a/include/CVertexBuffer.h b/include/CVertexBuffer.h
index e382dc5..7a91350 100644
--- a/include/CVertexBuffer.h
+++ b/include/CVertexBuffer.h
@@ -75,18 +75,18 @@ namespace scene
 		CVertexBuffer(video::E_VERTEX_TYPE vertexType) : Vertices(0),

 				MappingHint(EHM_NEVER), ChangedID(1)

 		{

-			setType(vertexType);

+			CVertexBuffer::setType(vertexType);

 		}

 

 		CVertexBuffer(const IVertexBuffer &VertexBufferCopy) :

 				Vertices(0), MappingHint(EHM_NEVER),

 				ChangedID(1)

 		{

-			setType(VertexBufferCopy.getType());

-			reallocate(VertexBufferCopy.size());

+			CVertexBuffer::setType(VertexBufferCopy.getType());

+			CVertexBuffer::reallocate(VertexBufferCopy.size());

 

 			for (u32 n=0;n<VertexBufferCopy.size();++n)

-				push_back(VertexBufferCopy[n]);

+				CVertexBuffer::push_back(VertexBufferCopy[n]);

 		}

 

 		virtual ~CVertexBuffer()

@@ -97,6 +97,9 @@ namespace scene
 

 		void setType(video::E_VERTEX_TYPE vertexType) override

 		{

+			if ( Vertices && Vertices->getType() == vertexType )

+				return;

+

 			IVertexList *NewVertices=0;

 

 			switch (vertexType)