griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Minor modification of image texture export of 'TexFace' mode materials

Browse Source 
which could have become a possible problem in the future.
Refinement button alignement in GI panel.
This commit is contained in:
Alfredo de Greef
2004-11-14 04:30:28 +00:00
parent a7d624b2c1
commit a61677f37f
4 changed files with 47 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/yafray/intern/export_File.cpp
View File

@@ -342,6 +342,10 @@ static string noise2string(short nbtype)
void yafrayFileRender_t::writeTextures()
{
// used to keep track of images already written
// (to avoid duplicates if also in imagetex for material TexFace texture)
map<Image*, bool> dupimg;
string ts;
for (map<string, MTex*>::const_iterator blendtex=used_textures.begin();
blendtex!=used_textures.end();++blendtex) {
@@ -489,8 +493,9 @@ void yafrayFileRender_t::writeTextures()
case TEX_IMAGE: {
Image* ima = tex->ima;
if (ima) {
// remove from imagetex list to avoid possible duplicates when TexFace used
imagetex.erase(ima);
// remember image to avoid duplicates later if also in imagetex
// (formerly done by removing from imagetex, but need image/material link)
dupimg[ima] = true;
ostr.str("");
// use image name instead of texname here
ostr << "<shader type=\"image\" name=\"" << ima->id.name << "\" >\n";
@@ -536,14 +541,17 @@ void yafrayFileRender_t::writeTextures()
for (map<Image*, Material*>::const_iterator imgtex=imagetex.begin();
imgtex!=imagetex.end();++imgtex)
{
ostr.str("");
ostr << "<shader type=\"image\" name=\"" << imgtex->first->id.name << "\" >\n";
ostr << "\t<attributes>\n";
string texpath(imgtex->first->name);
adjustPath(texpath);
ostr << "\t\t<filename value=\"" << texpath << "\" />\n";
ostr << "\t</attributes>\n</shader>\n\n";
xmlfile << ostr.str();
// skip if already written above
if (dupimg.find(imgtex->first)==dupimg.end()) {
ostr.str("");
ostr << "<shader type=\"image\" name=\"" << imgtex->first->id.name << "\" >\n";
ostr << "\t<attributes>\n";
string texpath(imgtex->first->name);
adjustPath(texpath);
ostr << "\t\t<filename value=\"" << texpath << "\" />\n";
ostr << "\t</attributes>\n</shader>\n\n";
xmlfile << ostr.str();
}
}
}