Simplified code in shapes tools.

git-svn-id: https://svn.blender.org/svnroot/bf-extensions/contrib@4487 96b784f8-4ae3-dd11-aff7-0030488c597c