fixed regression in the way bump mapping is computed, and refactored the code.
Merge remote-tracking branch 'upstream/master' into est_imath_convert_fix
Fixed PR comments.