performance on scene dataset sucks

djsutherland

...because the divergences are different from the old code. Track this down.