This is what I get for committing without testing. Fixed the bug I introduced, and converted another texture to use the new resource location object.