diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-05-25 14:14:05 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-05-25 14:19:28 +0200 |
| commit | a850d96fade014f11bc076fb916fae8c7c5eaecb (patch) | |
| tree | 3792d541213efe59c4e8ed5ec1a89a4d28e867db /external/collada2gltf | |
| parent | b421ce79e39867917ba53be7bf69c8a4e7f8a8ac (diff) | |
Update OpenCollada and collada2gltf to the newest versions.
Change-Id: Iee0b9f08843220e8ece00739ca01aa438b93965a
Diffstat (limited to 'external/collada2gltf')
| -rw-r--r-- | external/collada2gltf/GitSHA1.cpp | 2 | ||||
| -rw-r--r-- | external/collada2gltf/patches/wrong_uri_usage.patch.1 | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/external/collada2gltf/GitSHA1.cpp b/external/collada2gltf/GitSHA1.cpp index bd2cffe1f375..af4286061349 100644 --- a/external/collada2gltf/GitSHA1.cpp +++ b/external/collada2gltf/GitSHA1.cpp @@ -1,2 +1,2 @@ -#define GIT_SHA1 "6258611a6a4b4b94b963db5f1fe41c5290be1f87" +#define GIT_SHA1 "cb1d97788a38d2928afb4622f6a25d012f0f8a54" char g_GIT_SHA1[] = GIT_SHA1; diff --git a/external/collada2gltf/patches/wrong_uri_usage.patch.1 b/external/collada2gltf/patches/wrong_uri_usage.patch.1 index f42f435f9c4c..7c688ad97448 100644 --- a/external/collada2gltf/patches/wrong_uri_usage.patch.1 +++ b/external/collada2gltf/patches/wrong_uri_usage.patch.1 @@ -45,11 +45,10 @@ diff -ur collada2gltf.org/GLTF/GLTFAsset.cpp collada2gltf/GLTF/GLTFAsset.cpp std::ofstream f2(outputPath.c_str(), std::fstream::binary); if (this->_converterConfig->boolForKeyPath("verboseLogging")) { -@@ -397,8 +394,8 @@ +@@ -397,7 +394,8 @@ this->_root = shared_ptr <GLTF::JSONObject> (new GLTF::JSONObject()); - this->_root->setString(kProfile, profile->id()); this->_root->createObjectIfNeeded(kNodes); -- + - this->_writer.initWithPath(this->getOutputFilePath().c_str()); + COLLADABU::URI outputURI(this->getOutputFilePath().c_str()); + this->_writer.initWithPath(outputURI.toNativePath().c_str()); |