Somehow I had convinced myself that I had applied this patch [1] a while ago but I did not. Would it still be OK for me to apply this to trunk? [1] http://projects.blender.org/tracker/?func=detail&aid=33288&group_id=9&atid=127