Resolve conflicts with master

1 files changed, 3 insertions, 3 deletions

diff --git a/source/Irrlicht/CNullDriver.cpp b/source/Irrlicht/CNullDriver.cpp
index a76dbec..a02431c 100644
--- a/source/Irrlicht/CNullDriver.cpp
+++ b/source/Irrlicht/CNullDriver.cpp
@@ -1717,10 +1717,10 @@ s32 CNullDriver::addMaterialRenderer(IMaterialRenderer* renderer, const char* na
 

 

 //! Sets the name of a material renderer.

-void CNullDriver::setMaterialRendererName(s32 idx, const char* name)

+void CNullDriver::setMaterialRendererName(u32 idx, const char* name)

 {

-	if (idx < s32(sizeof(sBuiltInMaterialTypeNames) / sizeof(char*))-1 ||

-		idx >= (s32)MaterialRenderers.size())

+	if (idx < (sizeof(sBuiltInMaterialTypeNames) / sizeof(char*))-1 ||

+		idx >= MaterialRenderers.size())

 		return;

 

 	MaterialRenderers[idx].Name = name;