bug fixes to 3D pipeline#17

anneritoux wants to merge 2 commits intojduffield65:3Djduffield65/iss:3Dfrom

anneritoux:3Danneritoux/iss:3DCopy head branch name to clipboard