[Bf-blender-cvs] [b5739d8b902] collada: fix:Collada broken Scene Exporter function definition from earlier commit
Gaia Clary
noreply at git.blender.org
Wed Apr 10 22:40:26 CEST 2019
Commit: b5739d8b902c339125116be8283c339f94eade3f
Author: Gaia Clary
Date: Sat Apr 6 19:13:58 2019 +0200
Branches: collada
https://developer.blender.org/rBb5739d8b902c339125116be8283c339f94eade3f
fix:Collada broken Scene Exporter function definition from earlier commit
===================================================================
M source/blender/collada/SceneExporter.cpp
M source/blender/collada/SceneExporter.h
===================================================================
diff --git a/source/blender/collada/SceneExporter.cpp b/source/blender/collada/SceneExporter.cpp
index fd3d9b06033..37ef4c60956 100644
--- a/source/blender/collada/SceneExporter.cpp
+++ b/source/blender/collada/SceneExporter.cpp
@@ -73,7 +73,7 @@ void SceneExporter::exportHierarchy()
Object *ob = base_objects[index];
if (bc_is_marked(ob)) {
bc_remove_mark(ob);
- writeNodes(ob);
+ writeNode(ob);
}
}
}
@@ -91,12 +91,12 @@ void SceneExporter::writeNodeList(std::vector<Object *> &child_objects, Object *
Object *child = child_objects[i];
if (bc_is_marked(child)) {
bc_remove_mark(child);
- writeNodes(child);
+ writeNode(child);
}
}
}
-void SceneExporter::writeNodes(Object *ob)
+void SceneExporter::writeNode(Object *ob)
{
ViewLayer *view_layer = blender_context.get_view_layer();
@@ -112,7 +112,7 @@ void SceneExporter::writeNodes(Object *ob)
armature_exported = bc_is_in_Export_set(this->export_settings.get_export_set(), ob_arm, view_layer);
if (armature_exported && bc_is_marked(ob_arm)) {
bc_remove_mark(ob_arm);
- writeNodes(ob_arm);
+ writeNode(ob_arm);
armature_exported = true;
}
}
diff --git a/source/blender/collada/SceneExporter.h b/source/blender/collada/SceneExporter.h
index b0a209c18fc..9dd68e0b294 100644
--- a/source/blender/collada/SceneExporter.h
+++ b/source/blender/collada/SceneExporter.h
@@ -106,7 +106,7 @@ private:
void exportHierarchy();
void writeNodeList(std::vector<Object *> &child_objects, Object *parent);
- void writeNodes(Object *ob);
+ void writeNode(Object *ob);
};
More information about the Bf-blender-cvs
mailing list