luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Resolve conflicts with master

Browse Source
This commit is contained in:
numzero
2023-03-25 10:42:11 +03:00
parent ba77d01c91 799c8b936f
commit d97d1708d6
55 changed files with 474 additions and 7166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/Irrlicht/CNullDriver.h
View File

@@ -584,7 +584,7 @@ namespace video
bool writeImageToFile(IImage* image, io::IWriteFile * file, u32 param = 0) override;
//! Sets the name of a material renderer.
void setMaterialRendererName(s32 idx, const char* name) override;
void setMaterialRendererName(u32 idx, const char* name) override;
//! Swap the material renderers used for certain id's
void swapMaterialRenderers(u32 idx1, u32 idx2, bool swapNames) override;