# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 2013-12-10 19:30:37
# Node ID 394cafce8d314a0c04899146397a8149934a5e7f
# Parent  7f2a5a6d732c19a41cef2cc544e7c9f55d0d4a7f

graph: if the child has multiple parents then use the parents color - also when close to the child

diff --git a/kallithea/lib/graphmod.py b/kallithea/lib/graphmod.py
--- a/kallithea/lib/graphmod.py
+++ b/kallithea/lib/graphmod.py
@@ -131,7 +131,7 @@ def _colored(dag):
                 for p in parents:
                     bconf = getconf(p)
                     edges.append((
-                        ecol, next.index(p), color,
+                        ecol, next.index(p), colors[p] if len(parents) > 1 else color,
                         bconf.get('width', -1),
                         bconf.get('color', '')))