diff options
| author | Marius Kintel <marius@kintel.net> | 2011-09-07 20:27:29 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-09-07 20:27:29 (GMT) |
| commit | e9068e5adf96df48e2fef723251c7b35bdbffacf (patch) | |
| tree | f8f87d0ebdb02e6ab111dcbab0618e30a58bdd6d | |
| parent | 27a99044d8388ff30080bd0298eb936b8dd1341a (diff) | |
Updated tests to reflect recently changed import behavior
| -rw-r--r-- | src/import.cc | 2 | ||||
| -rw-r--r-- | tests/regression/csgtermtest/allmodules-expected.txt | 2 | ||||
| -rw-r--r-- | tests/regression/csgtermtest/import-expected.txt | 2 | ||||
| -rw-r--r-- | tests/regression/csgtermtest/import_off-expected.txt | 2 | ||||
| -rw-r--r-- | tests/regression/csgtermtest/import_stl-expected.txt | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/import.cc b/src/import.cc index 8c27832..0fdc156 100644 --- a/src/import.cc +++ b/src/import.cc @@ -117,7 +117,6 @@ PolySet *ImportNode::evaluate_polyset(render_mode_e, class PolySetEvaluator *) c if (this->type == TYPE_STL) { - p = new PolySet(); handle_dep(this->filename); QFile f(QString::fromStdString(this->filename)); if (!f.open(QIODevice::ReadOnly)) { @@ -125,6 +124,7 @@ PolySet *ImportNode::evaluate_polyset(render_mode_e, class PolySetEvaluator *) c return p; } + p = new PolySet(); QByteArray data = f.read(5); if (data.size() == 5 && QString(data) == QString("solid")) { diff --git a/tests/regression/csgtermtest/allmodules-expected.txt b/tests/regression/csgtermtest/allmodules-expected.txt index c375c01..d7a04fc 100644 --- a/tests/regression/csgtermtest/allmodules-expected.txt +++ b/tests/regression/csgtermtest/allmodules-expected.txt @@ -1 +1 @@ -((((((((((((((((linear_extrude14 + linear_extrude15) + rotate_extrude16) + rotate_extrude17) + import18) + import19) + import20) + import21) + cube23) + sphere24) + cylinder25) + polyhedron26) + square27) + circle28) + polygon29) + projection30) + surface32) +(((((((((((((linear_extrude14 + linear_extrude15) + rotate_extrude16) + rotate_extrude17) + import21) + cube23) + sphere24) + cylinder25) + polyhedron26) + square27) + circle28) + polygon29) + projection30) + surface32) diff --git a/tests/regression/csgtermtest/import-expected.txt b/tests/regression/csgtermtest/import-expected.txt index 847d6c3..a40cf60 100644 --- a/tests/regression/csgtermtest/import-expected.txt +++ b/tests/regression/csgtermtest/import-expected.txt @@ -1 +1 @@ -import2 +No top-level CSG object diff --git a/tests/regression/csgtermtest/import_off-expected.txt b/tests/regression/csgtermtest/import_off-expected.txt index 847d6c3..a40cf60 100644 --- a/tests/regression/csgtermtest/import_off-expected.txt +++ b/tests/regression/csgtermtest/import_off-expected.txt @@ -1 +1 @@ -import2 +No top-level CSG object diff --git a/tests/regression/csgtermtest/import_stl-expected.txt b/tests/regression/csgtermtest/import_stl-expected.txt index 847d6c3..a40cf60 100644 --- a/tests/regression/csgtermtest/import_stl-expected.txt +++ b/tests/regression/csgtermtest/import_stl-expected.txt @@ -1 +1 @@ -import2 +No top-level CSG object |