[Bf-blender-cvs] [8073d672abe] collada2.8: fix: collada: exporting object parent/child hierarchies only exported the root object

[Gaia Clary]

Commit: 8073d672abe9562ac0c23e43fd292bc6e1dac548
Author: Gaia Clary
Date:   Wed Nov 14 17:20:32 2018 +0100
Branches: collada2.8
https://developer.blender.org/rB8073d672abe9562ac0c23e43fd292bc6e1dac548

fix: collada: exporting object parent/child hierarchies only exported the root 
object

===================================================================

M       source/blender/collada/SceneExporter.cpp

===================================================================

diff --git a/source/blender/collada/SceneExporter.cpp 
b/source/blender/collada/SceneExporter.cpp
index f90d08aad59..e3d97b37ca6 100644
--- a/source/blender/collada/SceneExporter.cpp
+++ b/source/blender/collada/SceneExporter.cpp
@@ -162,7 +162,6 @@ void SceneExporter::writeNodes(bContext *C, Depsgraph 
*depsgraph, ViewLayer *vie
                // <instance_controller>
                else if (ob->type == OB_ARMATURE) {
                        arm_exporter->add_armature_bones(ob, view_layer, this, 
child_objects);
-                       writeNodeList(C, depsgraph, view_layer, child_objects, 
ob);
                }
 
                // <instance_camera>
@@ -232,11 +231,8 @@ void SceneExporter::writeNodes(bContext *C, Depsgraph 
*depsgraph, ViewLayer *vie
                                        con = con->next;
                                }
                        }
-                       writeNodeList(C, depsgraph, view_layer, child_objects, 
ob);
-               }
-               else {
-                       writeNodeList(C, depsgraph, view_layer, child_objects, 
ob);
                }
+               writeNodeList(C, depsgraph, view_layer, child_objects, ob);
                colladaNode.end();
        }
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs