Blender Git Loki

Fix black matcap when using particle system

Using matcap with a displist is not really good thing to try
and it's actually a regression since we've enabled matcaps
for all objects instead of just an active one.

Conflicts:
source/blender/editors/space_view3d/view3d_draw.c