Warp by object

Allow warping by objects. Sorry for first commit. But sticking it into an own branch would be too much for for this change ;)