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
path: root/source
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2021-07-05 19:03:57 +0300
committerBastien Montagne <bastien@blender.org>2021-07-05 19:07:02 +0300
commit08241b313c6dd7b59e51f028ef23a728344b2834 (patch)
tree7be6a0da7327a062a52835bf933368a0810ad48d /source
parent0ef794b5534ab28901cbb18d69ba0e6642439ba9 (diff)
Fix (studio reported) missing object's parent handling in readfile expand code.
This would prevent loading a parent that would only be referenced by children during a linking operation. Looks like this missing bit of code has been there since the stone ages, it is fairly baffling to find that such critical low-levels mistakes can survive decades in a codebase... Note that such fully-indirectly linked parent object is not instantiated in scene currently, this is fairly bad I think, but kind of a different issue.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/object.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 5b8b701c975..e0b23958ec9 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1041,6 +1041,8 @@ static void object_blend_read_expand(BlendExpander *expander, ID *id)
BLO_expand(expander, ob->data);
+ BLO_expand(expander, ob->parent);
+
/* expand_object_expandModifier() */
if (ob->modifiers.first) {
BKE_modifiers_foreach_ID_link(ob, expand_object_expandModifiers, expander);