Resolve conflicts with master

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

diff --git a/source/Irrlicht/CNullDriver.h b/source/Irrlicht/CNullDriver.h
index 33620452df6f4db6b7d0cc5abfbc5061f7b5f586..e6b27d87718b3397c7f8ad9e9c0ecce24ebc1a9a 100644 (file)
--- a/source/Irrlicht/CNullDriver.h
+++ b/source/Irrlicht/CNullDriver.h
@@ -584,7 +584,7 @@ namespace video
                bool writeImageToFile(IImage* image, io::IWriteFile * file, u32 param = 0) override;\r
 \r
                //! Sets the name of a material renderer.\r
-               void setMaterialRendererName(s32 idx, const char* name) override;\r
+               void setMaterialRendererName(u32 idx, const char* name) override;\r
 \r
                //! Swap the material renderers used for certain id's\r
                void swapMaterialRenderers(u32 idx1, u32 idx2, bool swapNames) override;\r