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 | |
parent | be983295ea14af226b3c824a035ccee9d416c67f (diff) | |
parent | af36dd4664ddf35c7ad99f05f9878ce1acf787bd (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada')
-rw-r--r-- | source/blender/collada/ErrorHandler.h | 1 | ||||
-rw-r--r-- | source/blender/collada/ExtraHandler.h | 1 | ||||
-rw-r--r-- | source/blender/collada/GeometryExporter.cpp | 2 | ||||
-rw-r--r-- | source/blender/collada/SceneExporter.cpp | 1 | ||||
-rw-r--r-- | source/blender/collada/collada_internal.cpp | 1 |
5 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/collada/ErrorHandler.h b/source/blender/collada/ErrorHandler.h index 3b3797e935a..2e648f54c4e 100644 --- a/source/blender/collada/ErrorHandler.h +++ b/source/blender/collada/ErrorHandler.h @@ -53,4 +53,3 @@ private: /** Hold error status. */ bool mError; }; - diff --git a/source/blender/collada/ExtraHandler.h b/source/blender/collada/ExtraHandler.h index 4dda862b3cc..826557ebaab 100644 --- a/source/blender/collada/ExtraHandler.h +++ b/source/blender/collada/ExtraHandler.h @@ -83,4 +83,3 @@ private: ExtraTags* currentExtraTags; std::string currentElement; }; - 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); } - - diff --git a/source/blender/collada/SceneExporter.cpp b/source/blender/collada/SceneExporter.cpp index d909203488e..47d8f4f52bb 100644 --- a/source/blender/collada/SceneExporter.cpp +++ b/source/blender/collada/SceneExporter.cpp @@ -241,4 +241,3 @@ void SceneExporter::writeNodes(bContext *C, Depsgraph *depsgraph, Object *ob, Sc if (ob->type != OB_ARMATURE) colladaNode.end(); } - diff --git a/source/blender/collada/collada_internal.cpp b/source/blender/collada/collada_internal.cpp index cf4dcb5eb42..a0b9f8d4e38 100644 --- a/source/blender/collada/collada_internal.cpp +++ b/source/blender/collada/collada_internal.cpp @@ -351,4 +351,3 @@ std::string get_morph_id(Object *ob) { return translate_id(id_name(ob)) + "-morph"; } - |