mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 03:53:52 +00:00
Code Issues Releases Wiki Activity

Material fixes

Browse source
This commit is contained in:
Chris Robinson 2013-04-07 07:53:01 -07:00
parent 88c81bfb24
commit fe9a7f12b6
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/nifogre/ogrenifloader.cpp
View file

@ -947,9 +947,11 @@ static Ogre::String getMaterial(const Nif::ShapeData *shapedata,
boost::hash_combine(h, diffuse.x); boost::hash_combine(h, diffuse.x);
boost::hash_combine(h, diffuse.y); boost::hash_combine(h, diffuse.y);
boost::hash_combine(h, diffuse.z); boost::hash_combine(h, diffuse.z);
boost::hash_combine(h, alpha);
boost::hash_combine(h, specular.x); boost::hash_combine(h, specular.x);
boost::hash_combine(h, specular.y); boost::hash_combine(h, specular.y);
boost::hash_combine(h, specular.z); boost::hash_combine(h, specular.z);
boost::hash_combine(h, glossiness);
boost::hash_combine(h, emissive.x); boost::hash_combine(h, emissive.x);
boost::hash_combine(h, emissive.y); boost::hash_combine(h, emissive.y);
boost::hash_combine(h, emissive.z); boost::hash_combine(h, emissive.z);
@ -1108,7 +1110,7 @@ class NIFObjectLoader : Ogre::ManualResourceLoader
const Nif::NiVertexColorProperty *&vertprop, const Nif::NiVertexColorProperty *&vertprop,
const Nif::NiZBufferProperty *&zprop, const Nif::NiZBufferProperty *&zprop,
const Nif::NiSpecularProperty *&specprop, const Nif::NiSpecularProperty *&specprop,
const Nif::NiWireframeProperty *wireprop) const Nif::NiWireframeProperty *&wireprop)
{ {
if(node->parent) if(node->parent)
getNodeProperties(node->parent, texprop, matprop, alphaprop, vertprop, zprop, specprop, wireprop); getNodeProperties(node->parent, texprop, matprop, alphaprop, vertprop, zprop, specprop, wireprop);