Cycles:
* Fix for [#33909]. If "Progressive" checkbox was disabled but device was GPU, it still used the amount of "aa_samples" instead of "samples"

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