Fix crash when morphing from 2D to 3D.
Updates based on review.
Merge pull request #889 from AnalyticalGraphicsInc/issue884

Fix Issue 884