Cycles: bump node changes to add a Distance input that controls the overall displacement
distance, and an Invert option to invert the bump effect.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@56666 954f8c5b-7b00-dc11-b283-0030488c597c
Fix for version patch in recent smoke commit, was using && instead of &.

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