[Bf-blender-cvs] [6cec91b470a] collada: fix: wrong root object identified when exporting object hierarchies
Gaia Clary
noreply at git.blender.org
Wed Apr 10 22:40:17 CEST 2019
Commit: 6cec91b470ade0b1f405e0eebce981ca493e8947
Author: Gaia Clary
Date: Thu Apr 4 17:14:37 2019 +0200
Branches: collada
https://developer.blender.org/rB6cec91b470ade0b1f405e0eebce981ca493e8947
fix: wrong root object identified when exporting object hierarchies
===================================================================
M source/blender/collada/collada_utils.cpp
===================================================================
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index 93b8b15076f..79ac497e984 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -320,9 +320,11 @@ Object *bc_get_highest_selected_ancestor_or_self(LinkNode *export_set, Object *o
{
Object *ancestor = ob;
- while (ob->parent && bc_is_marked(ob->parent)) {
+ while (ob->parent) {
+ if (bc_is_marked(ob->parent)){
+ ancestor = ob->parent;
+ }
ob = ob->parent;
- ancestor = ob;
}
return ancestor;
}
More information about the Bf-blender-cvs
mailing list