Merge "Updated Model3dView control to use SetTexture" into devel/master