suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0000714: Merge project does not include DiffuseColor

Browse Source
This commit is contained in:
wmayer 2012-05-29 11:40:51 +02:00
parent dcffcbe168
commit 141cd5029a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Gui/Document.cpp
View File

@ -748,7 +748,7 @@ void Document::exportObjects(const std::vector<App::DocumentObject*>& obj, Base:
<< views.size() <<"\">" << std::endl;
bool xml = writer.isForceXML();
writer.setForceXML(true);
//writer.setForceXML(true);
writer.incInd(); // indention for 'ViewProvider name'
std::map<const App::DocumentObject*,ViewProvider*>::const_iterator jt;
for (jt = views.begin(); jt != views.end(); ++jt) {

4
src/Gui/MergeDocuments.cpp
View File

@ -235,4 +235,8 @@ void MergeDocuments::RestoreDocFile(Base::Reader & reader)
}
xmlReader.readEndElement("Document");
// In the file GuiDocument.xml new data files might be added
if (!xmlReader.getFilenames().empty())
xmlReader.readFiles(static_cast<zipios::ZipInputStream&>(reader));
}