[Bf-blender-cvs] [7bd98ac] bake-cycles: Merge remote-tracking branch 'upstream/master' into bake-cycles

[Dalai Felinto]

Commit: 7bd98ac6a5d588c4f26955debf76cf53e79546e4
Author: Dalai Felinto
Date:   Sat Apr 26 13:26:22 2014 -0300
https://developer.blender.org/rB7bd98ac6a5d588c4f26955debf76cf53e79546e4

Merge remote-tracking branch 'upstream/master' into bake-cycles

Note: as per previous 'master' commits I will need to convert the arrays
to const arrays. Campbell, were you doing that manually? or you have a
script to do so?

===================================================================



===================================================================