mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'chris/material-fix'

Browse Source
This commit is contained in:
Marc Zinnschlag 2013-03-04 19:40:22 +01:00
commit 83865cb186
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/nifogre/ogrenifloader.cpp
View File

@ -993,7 +993,7 @@ class NIFMeshLoader : Ogre::ManualResourceLoader
} }
} }
std::string matname = NIFMaterialLoader::getMaterial(shape, mName, mGroup, std::string matname = NIFMaterialLoader::getMaterial(shape, mesh->getName(), mGroup,
texprop, matprop, alphaprop, texprop, matprop, alphaprop,
vertprop, zprop, specprop); vertprop, zprop, specprop);
if(matname.length() > 0) if(matname.length() > 0)
@ -1001,12 +1001,12 @@ class NIFMeshLoader : Ogre::ManualResourceLoader
} }
bool findTriShape(Ogre::Mesh *mesh, const Nif::Node *node, bool findTriShape(Ogre::Mesh *mesh, const Nif::Node *node,
const Nif::NiTexturingProperty *texprop=NULL, const Nif::NiTexturingProperty *texprop,
const Nif::NiMaterialProperty *matprop=NULL, const Nif::NiMaterialProperty *matprop,
const Nif::NiAlphaProperty *alphaprop=NULL, const Nif::NiAlphaProperty *alphaprop,
const Nif::NiVertexColorProperty *vertprop=NULL, const Nif::NiVertexColorProperty *vertprop,
const Nif::NiZBufferProperty *zprop=NULL, const Nif::NiZBufferProperty *zprop,
const Nif::NiSpecularProperty *specprop=NULL) const Nif::NiSpecularProperty *specprop)
{ {
// Scan the property list for material information // Scan the property list for material information
const Nif::PropertyList &proplist = node->props; const Nif::PropertyList &proplist = node->props;
@ -1081,7 +1081,7 @@ public:
} }
const Nif::Node *node = dynamic_cast<const Nif::Node*>(nif->getRecord(0)); const Nif::Node *node = dynamic_cast<const Nif::Node*>(nif->getRecord(0));
findTriShape(mesh, node); findTriShape(mesh, node, NULL, NULL, NULL, NULL, NULL, NULL);
} }
void createMeshes(const Nif::Node *node, MeshInfoList &meshes, int flags=0) void createMeshes(const Nif::Node *node, MeshInfoList &meshes, int flags=0)