added 3D object virtual view
clean up code
clean up code
no idea what's this
Merge branch 'andrew' into nahush
code cleanup
cleanup