Finalizing the merge of the OpenGL transform changes.  The project now builds again.