Merge branch 'NateEag-master-patch-12920' into 'master'

[xonotic/netradiant.git] / plugins / textool / ControlPointsManager.cpp

diff --git a/plugins/textool/ControlPointsManager.cpp b/plugins/textool/ControlPointsManager.cpp
index d4da9ffc8643e524ef7392af144ceee9238567ec..796cf9a5c741dfb6f8348ef91aef6bd7752978b9 100644 (file)
--- a/plugins/textool/ControlPointsManager.cpp
+++ b/plugins/textool/ControlPointsManager.cpp
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1999-2007 id Software, Inc. and contributors.
+   Copyright (C) 1999-2006 Id Software, Inc. and contributors.
    For a list of contributors, see the accompanying CONTRIBUTORS file.
 
    This file is part of GtkRadiant.
@@ -29,7 +29,7 @@
 #include "StdAfx.h"
 
 void CControlPointsManagerBFace::Init( int iPts, CtrlPts_t *Pts, C2DView *p2DView, int TexSize[2],
-                                                                          _QERFaceData* pFaceData, _QERQglTable *pQglTable ){
+                                                                          _QERFaceData* pFaceData, OpenGLBinding *pQglTable ){
        ManagerState = Idle;
        m_NumPoints = iPts;
        m_pPts = Pts;
@@ -158,7 +158,7 @@ bool CControlPointsManagerBFace::OnLButtonUp( int x, int y ){
        return false;
 }
 
-void CControlPointsManagerBFace::Render(){
+void CControlPointsManagerBFace::render(){
        int i;
 
        m_pQglTable->m_pfn_qglColor3f( 0, 1, 0 );
@@ -228,7 +228,7 @@ void CControlPointsManagerBFace::XYSpaceForSTSpace( float xy[2], const float st[
    ======================================================================
  */
 
-void CControlPointsManagerPatch::Init( patchMesh_t* pWorkPatch, C2DView *p2DView, _QERQglTable *pQglTable, patchMesh_t* pPatch ){
+void CControlPointsManagerPatch::Init( patchMesh_t* pWorkPatch, C2DView *p2DView, OpenGLBinding *pQglTable, patchMesh_t* pPatch ){
        CControlPointsManager::Init( p2DView, pQglTable );
        m_pPatch = pPatch;
        m_pWorkPatch = pWorkPatch;
@@ -279,7 +279,7 @@ bool CControlPointsManagerPatch::OnLButtonUp( int x, int y ){
        return false;
 }
 
-void CControlPointsManagerPatch::Render(){
+void CControlPointsManagerPatch::render(){
        int i,j;
 
        m_pQglTable->m_pfn_qglColor3f( 0, 1, 0 );