diff options
| author | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-07 04:24:21 +0000 |
|---|---|---|
| committer | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-07 04:24:21 +0000 |
| commit | 34f464fb752432829a22a30767b66eb5c24a2242 (patch) | |
| tree | 93545e6e6f56e7151ae8bc5100accf0998c262ad /o3d/converter/cross | |
| parent | e8b80d819b7d1888e10f5cfef75bfeff0f5d3b03 (diff) | |
| download | chromium_src-34f464fb752432829a22a30767b66eb5c24a2242.zip chromium_src-34f464fb752432829a22a30767b66eb5c24a2242.tar.gz chromium_src-34f464fb752432829a22a30767b66eb5c24a2242.tar.bz2 | |
Add o3djs.DestinationBuffer to converter.
I named it o3djs.DestinationBuffer because it has nothing to do
with O3D. It's purely part of our sample serialization example.
Review URL: http://codereview.chromium.org/149236
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/converter/cross')
| -rw-r--r-- | o3d/converter/cross/converter.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/o3d/converter/cross/converter.cc b/o3d/converter/cross/converter.cc index 6f50787..42d7996 100644 --- a/o3d/converter/cross/converter.cc +++ b/o3d/converter/cross/converter.cc @@ -94,6 +94,7 @@ bool Convert(const FilePath& in_filename, ErrorStatus error_status(&service_locator); Features features(&service_locator); + Collada::Init(&service_locator); features.Init("MaxCapabilities"); // Collect error messages. @@ -119,7 +120,8 @@ bool Convert(const FilePath& in_filename, collada_options.base_path = options.base_path; collada_options.up_axis = options.up_axis; Collada collada(pack.Get(), collada_options); - if (!collada.ImportFile(in_filename, root, param_float)) { + bool result = collada.ImportFile(in_filename, root, param_float); + if (!result || !error_collector.errors().empty()) { if (error_messages) { *error_messages += error_collector.errors(); } |