diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-23 20:14:12 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-23 20:14:12 (GMT) |
| commit | d6efe5cbcb99f7730b47b5945f305f08b5d21b94 (patch) | |
| tree | eb429be5acf82a5710d9879dd5fd00b62f1788b7 /tests/csgtestcore.cc | |
| parent | 87ce149df2581361e8975bd1a0addf2b6ef61e3d (diff) | |
| parent | 10c96326866c8256e82f0092a18f4f4e3ca06a74 (diff) | |
Merge branch 'master' into boost_filesystem
Conflicts:
tests/CMakeLists.txt
Diffstat (limited to 'tests/csgtestcore.cc')
| -rw-r--r-- | tests/csgtestcore.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/csgtestcore.cc b/tests/csgtestcore.cc index a58c1fd..c2be326 100644 --- a/tests/csgtestcore.cc +++ b/tests/csgtestcore.cc @@ -289,9 +289,10 @@ int csgtestcore(int argc, char *argv[], test_type_e test_type) exit(1); } - QFileInfo fileInfo(filename); - if (!sysinfo_dump) + if (!sysinfo_dump) { + QFileInfo fileInfo(filename); QDir::setCurrent(fileInfo.absolutePath()); + } AbstractNode::resetIndexCounter(); AbstractNode *absolute_root_node = root_module->evaluate(&root_ctx, &root_inst); @@ -322,10 +323,7 @@ int csgtestcore(int argc, char *argv[], test_type_e test_type) } assert(csgInfo.root_norm_term); - if (csgInfo.root_norm_term.use_count() <= 1) { - fprintf(stderr, "XXX\n"); - } - + csgInfo.root_chain = new CSGChain(); csgInfo.root_chain->import(csgInfo.root_norm_term); fprintf(stderr, "Normalized CSG tree has %d elements\n", int(csgInfo.root_chain->polysets.size())); |