Resolve conflicts with master

[irrlicht.git] / source / Irrlicht / CNullDriver.cpp

diff --git a/source/Irrlicht/CNullDriver.cpp b/source/Irrlicht/CNullDriver.cpp
index a76dbecf4e41254143bd000e5b655a70759e911a..a02431cf8f51b44d2032619129786a05d6d53bc7 100644 (file)
--- a/source/Irrlicht/CNullDriver.cpp
+++ b/source/Irrlicht/CNullDriver.cpp
@@ -1717,10 +1717,10 @@ s32 CNullDriver::addMaterialRenderer(IMaterialRenderer* renderer, const char* na
 \r
 \r
 //! Sets the name of a material renderer.\r
-void CNullDriver::setMaterialRendererName(s32 idx, const char* name)\r
+void CNullDriver::setMaterialRendererName(u32 idx, const char* name)\r
 {\r
-       if (idx < s32(sizeof(sBuiltInMaterialTypeNames) / sizeof(char*))-1 ||\r
-               idx >= (s32)MaterialRenderers.size())\r
+       if (idx < (sizeof(sBuiltInMaterialTypeNames) / sizeof(char*))-1 ||\r
+               idx >= MaterialRenderers.size())\r
                return;\r
 \r
        MaterialRenderers[idx].Name = name;\r