The fr parameter is now declared as const in local function ImportFace
This commit is contained in:
parent
f30376e18d
commit
413001c79b
|
@ -78,17 +78,17 @@ public:
|
|||
typedef typename MeshRight::FaceIterator FaceIteratorRight;
|
||||
typedef typename MeshRight::FacePointer FacePointerRight;
|
||||
|
||||
static void ImportFace(MeshLeft &ml, MeshRight &mr, FaceLeft &fl, FaceRight &fr, std::vector<int> &remap)
|
||||
static void ImportFace(MeshLeft &ml, MeshRight &mr, FaceLeft &fl, const FaceRight &fr, std::vector<int> &remap)
|
||||
{
|
||||
fl.ImportLocal(fr);
|
||||
fl.ImportLocal<FaceRight>(fr);
|
||||
fl.V(0)=&ml.vert[remap[ Index(mr,fr.V(0))]];
|
||||
fl.V(1)=&ml.vert[remap[ Index(mr,fr.V(1))]];
|
||||
fl.V(2)=&ml.vert[remap[ Index(mr,fr.V(2))]];
|
||||
|
||||
if(HasPerWedgeTexCoord(mr) && HasPerWedgeTexCoord(ml))
|
||||
for(int i=0;i<3;++i){
|
||||
fl.WT(i).P()=fr.WT(i).P();
|
||||
fl.WT(i).N()=fr.WT(i).N()+ml.textures.size();
|
||||
fl.WT(i).P()=fr.cWT(i).P();
|
||||
fl.WT(i).N()=fr.cWT(i).N()+ml.textures.size();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue