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

DXF export: always declare layers before using them.

Browse Source 
Before this commit, the #s001-active-grp layer was not declared,
and this broke some external software, such as Inkscape.
See https://bugs.launchpad.net/inkscape/+bug/1472429 for details.
This commit is contained in:
EvilSpirit 2016-08-07 19:42:05 +07:00 committed by whitequark
parent 0b997e4c17
commit 4d2c773ee6
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/exportvector.cpp
View File

@ -175,21 +175,16 @@ public:
layer.name = "text"; layer.name = "text";
dxf->writeLayer(&layer); dxf->writeLayer(&layer);
for(int i = 0; i < SK.style.n; i++) { std::set<uint32_t> usedStyles;
Style *s = &SK.style.elem[i];
// check for using
bool used = false;
for(DxfFileWriter::BezierPath &path : writer->paths) { for(DxfFileWriter::BezierPath &path : writer->paths) {
for(SBezier *sb : path.beziers) { for(SBezier *sb : path.beziers) {
if((uint32_t)sb->auxA != s->h.v) continue; usedStyles.insert((uint32_t)sb->auxA);
used = true;
break;
} }
if(used) break;
} }
if(!used) continue;
for(uint32_t v : usedStyles) {
Style *s = Style::Get(hStyle{v});
layer.name = s->DescriptionString(); layer.name = s->DescriptionString();
dxf->writeLayer(&layer); dxf->writeLayer(&layer);
} }