[Bf-blender-cvs] [55ae54c469e] blender2.8: Fix relationship lines in draw manager [*]

Dalai Felinto noreply at git.blender.org
Thu May 4 09:59:37 CEST 2017


Commit: 55ae54c469e10a5a7327a739b68316b91ee81472
Author: Dalai Felinto
Date:   Thu May 4 09:57:17 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB55ae54c469e10a5a7327a739b68316b91ee81472

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.

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

M	source/blender/draw/modes/object_mode.c

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

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]);
 	}




More information about the Bf-blender-cvs mailing list