Blender Git Loki

Orange: Library linking half-assed-fix for files that mix linked "direct"
data (local data links to lib data) and "indirect" (lib links to same lib
data).

A real solution should be found though... there's a conflict in the code
I don't fully grasp yet.