diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
commit | 9bd0c63382bf226c271c40d5a5967c22c75718ea (patch) | |
tree | 97ad1061c10f39498459d54da34caddd59d39fbd /source/blender/collada/GeometryExporter.cpp | |
parent | be983295ea14af226b3c824a035ccee9d416c67f (diff) | |
parent | af36dd4664ddf35c7ad99f05f9878ce1acf787bd (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/GeometryExporter.cpp')
-rw-r--r-- | source/blender/collada/GeometryExporter.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp index fae1fc048c8..0beded56b3b 100644 --- a/source/blender/collada/GeometryExporter.cpp +++ b/source/blender/collada/GeometryExporter.cpp @@ -680,5 +680,3 @@ COLLADASW::URI GeometryExporter::makeUrl(std::string id) { return COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, id); } - - |