MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some warnings, bugs, and still the annoying merge conflict. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1197 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2008-01-21 23:56:39 +00:00
parent 638104c129
commit e66d6fa7a3
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/ISceneManager.h
View File

@ -82,19 +82,6 @@ namespace scene
//! to front and drawn in that order.
ESNRP_TRANSPARENT,
//! Scene Nodes with special support
ESNRP_SHADER_0,
ESNRP_SHADER_1,
ESNRP_SHADER_2,
ESNRP_SHADER_3,
ESNRP_SHADER_4,
ESNRP_SHADER_5,
ESNRP_SHADER_6,
ESNRP_SHADER_7,
ESNRP_SHADER_8,
ESNRP_SHADER_9,
ESNRP_SHADER_10,
//! Never used, value specifing how much parameters there are.
ESNRP_COUNT
};

2
source/Irrlicht/CColladaFileLoader.h
View File

@ -176,7 +176,7 @@ private:
void readLibrarySection(io::IXMLReaderUTF8* reader);
//! reads a <visual_scene> element and stores it as a prefab
void CColladaFileLoader::readVisualSceneSection(io::IXMLReaderUTF8* reader);
void readVisualSceneSection(io::IXMLReaderUTF8* reader);
//! reads a <scene> section and its content
void readSceneSection(io::IXMLReaderUTF8* reader);

4
source/Irrlicht/CLWOMeshFileLoader.cpp
View File

@ -555,7 +555,7 @@ void CLWOMeshFileLoader::readMat(u32 size)
u32 uiType;
u32 tmp32;
u16 subsize, tmp16;
u32 tmpf32;
f32 tmpf32;
File->read(&type, 4);
//Convert 4-char string to 4-byte integer
//Makes it possible to do a switch statement
@ -985,7 +985,7 @@ void CLWOMeshFileLoader::readMat(u32 size)
#ifndef __BIG_ENDIAN__
tmp16=os::Byteswap::byteswap(tmp16);
#endif
mat->Texture[currTexture].Active=tmp16;
mat->Texture[currTexture].Active=(tmp16!=0);
size -= 2;
}
break;