code cleanup:
- remove unused defines.
- quiet some shadow warnings.
- bevel, ifdef out some asserts that are too common.
- style


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