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:
authorDalai Felinto <dfelinto@gmail.com>2017-05-04 10:57:17 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-05-04 10:57:20 +0300
commit55ae54c469e10a5a7327a739b68316b91ee81472 (patch)
tree6c40e014c8fde5186c86f5c8409987b2f106b92d /source/blender/draw/modes/object_mode.c
parentb2e908f929d488752290901163fdd4fc20af9b34 (diff)
Fix relationship lines in draw manager [*]
This fix doesn't really fix the situaion now because at the moment we only flush the evaluated flags at DEG_OBJECT_ITER time, which is silly. But it's all we can do until we have CoW. So the parent visibility flag is not flushed. And even if we flushed its visibility flag, we would need to rely on having the parent flag flushed before we get to the object in question. Anyways, take this commit as a future fix for when depsgraph comes to rescue all our souls.
Diffstat (limited to 'source/blender/draw/modes/object_mode.c')
-rw-r--r--source/blender/draw/modes/object_mode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 65d3fba619f..c99cd7f7ece 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -1142,7 +1142,7 @@ static void DRW_shgroup_speaker(OBJECT_StorageList *stl, Object *ob, SceneLayer
static void DRW_shgroup_relationship_lines(OBJECT_StorageList *stl, Object *ob)
{
- if (ob->parent) {
+ if (ob->parent && ((ob->parent->base_flag & BASE_VISIBLED) != 0)) {
DRW_shgroup_call_dynamic_add(stl->g_data->relationship_lines, ob->obmat[3]);
DRW_shgroup_call_dynamic_add(stl->g_data->relationship_lines, ob->parent->obmat[3]);
}