Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-09-26 17:24:10 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-09-26 17:24:10 +0300
commit772944a6b47f1bb1bcefc7eb220bee5924c4e4d9 (patch)
treea08cac00f66e2dc21e58b213c380ab76f23b8368 /source/blender/collada/DocumentImporter.cpp
parent51c87bbad0b70f33c96955256c7935f124d00382 (diff)
parent870dfb1b5aac1c5c4dbcce0f8318c11d229bf3ac (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/DocumentImporter.cpp')
-rw-r--r--source/blender/collada/DocumentImporter.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index 2d428d6fe5d..39a36781e0e 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -511,9 +511,9 @@ std::vector<Object *> *DocumentImporter::write_node(COLLADAFW::Node *node, COLLA
std::vector<Object *> *root_objects = new std::vector<Object *>();
fprintf(stderr,
- "Writing node id='%s', name='%s'\n",
- id.c_str(),
- name.c_str());
+ "Writing node id='%s', name='%s'\n",
+ id.c_str(),
+ name.c_str());
if (is_joint) {
if (parent_node == NULL && !is_library_node) {