Matcap fix:

Setting Cycles as render engine skipped matcap drawing.
Logic for checking drawing types needed a shuffle.



git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@53993 954f8c5b-7b00-dc11-b283-0030488c597c