code cleanup: unused defines, shadowing and unintended enum-as-variable.


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