Cycles: svn merge -r41225:41232 ^/trunk/blender
[blender.git] / source / blender / editors / render / render_preview.c