UI naming consistency:
* ShapeKey -> Shape Key. Was called "Shape Key" in most places already.

Pointed out by Dalai, thanks! 

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@56604 954f8c5b-7b00-dc11-b283-0030488c597c
bugfix: [#31757] setGLSLMaterialSetting has no effect
original patch by me, with contribution from HG1 and Florian Völker

bug introduced in rev. 40113


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