3dquiver rebranch

Replaces #2961
ah, I missed that this PR was merged already. I had just simply updated my branch. I'll fix that.