Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #878 Fix typos in comments/code

Browse source
This commit is contained in:
kervala 2010-11-03 13:44:27 +01:00
parent 668153eb56
commit 708d0503a3
4 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/3d/driver/opengl/driver_opengl.def
View file

@ -1,2 +1,2 @@
EXPORTS NL3D_createIDriverInstance EXPORTS NL3D_createIDriverInstance
EXPORTS NL3D_interfaceVersion EXPORTS NL3D_interfaceVersion

3
code/nel/src/3d/driver/opengl/driver_opengl_states.cpp
View file

@ -743,9 +743,8 @@ void CDriverGLStates::enableVertexArray(bool enable)
glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_VERTEX_ARRAY);
else else
glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_VERTEX_ARRAY);
_VertexArrayEnabled= enable; _VertexArrayEnabled= enable;
} }
} }
// *************************************************************************** // ***************************************************************************

3
code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp
View file

@ -1016,7 +1016,6 @@ void CDriverGL::toggleGlArraysForNVVertexProgram()
_DriverGLStates.enableTexCoordArray(false); _DriverGLStates.enableTexCoordArray(false);
} }
// now, vertex program setup. // now, vertex program setup.
_LastSetupGLArrayVertexProgram= true; _LastSetupGLArrayVertexProgram= true;
} }
@ -1080,6 +1079,7 @@ void CDriverGL::toggleGlArraysForARBVertexProgram()
_DriverGLStates.clientActiveTextureARB(i); _DriverGLStates.clientActiveTextureARB(i);
_DriverGLStates.enableTexCoordArray(false); _DriverGLStates.enableTexCoordArray(false);
} }
// now, vertex program setup. // now, vertex program setup.
_LastSetupGLArrayVertexProgram= true; _LastSetupGLArrayVertexProgram= true;
} }
@ -1129,7 +1129,6 @@ void CDriverGL::toggleGlArraysForEXTVertexShader()
_DriverGLStates.enableTexCoordArray(false); _DriverGLStates.enableTexCoordArray(false);
} }
// now, vertex program setup. // now, vertex program setup.
_LastSetupGLArrayVertexProgram= true; _LastSetupGLArrayVertexProgram= true;
} }

26
code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp
View file

@ -223,13 +223,13 @@ namespace NLQT
// Get the left view // Get the left view
//CView* pView = getLeftView (); //CView* pView = getLeftView ();
} }
} }
catch (Exception &e) catch (Exception &e)
{ {
nlerror("Error while loading file: %s", e.what()); nlerror("Error while loading file: %s", e.what());
} }
} }
else else
{ //if (!file.open()) { //if (!file.open())
nlerror("Can't open the file %s for writing.", s); nlerror("Can't open the file %s for writing.", s);
} }
@ -237,7 +237,7 @@ namespace NLQT
void CGeorgesTreeViewDialog::doubleClicked ( const QModelIndex & index ) void CGeorgesTreeViewDialog::doubleClicked ( const QModelIndex & index )
{ {
if (index.column() == 1) if (index.column() == 1)
return; return;
CFormItem *item = static_cast<CFormItem*>(index.internalPointer()); CFormItem *item = static_cast<CFormItem*>(index.internalPointer());
@ -247,7 +247,7 @@ namespace NLQT
if (!path.isEmpty() && !path.contains(".shape")) if (!path.isEmpty() && !path.contains(".shape"))
Q_EMIT changeFile(path); Q_EMIT changeFile(path);
if (path.contains(".shape")) if (path.contains(".shape"))
{ {
Modules::objView().resetScene(); Modules::objView().resetScene();
Modules::config().configRemapExtensions(); Modules::config().configRemapExtensions();
@ -258,22 +258,22 @@ namespace NLQT
void CGeorgesTreeViewDialog::closeEvent(QCloseEvent *event) void CGeorgesTreeViewDialog::closeEvent(QCloseEvent *event)
{ {
if (Modules::mainWin().getEmptyView() == this) if (Modules::mainWin().getEmptyView() == this)
{ {
event->ignore(); event->ignore();
} }
else else
{ {
Modules::mainWin().getTreeViewList().removeOne(this); Modules::mainWin().getTreeViewList().removeOne(this);
if(!Modules::mainWin().getTreeViewList().size()) if(!Modules::mainWin().getTreeViewList().size())
{ {
Modules::mainWin().createEmptyView(); Modules::mainWin().createEmptyView();
} }
deleteLater(); deleteLater();
} }
} }
void CGeorgesTreeViewDialog::showParentRows(int newState) void CGeorgesTreeViewDialog::showParentRows(int newState)
{ {
CGeorgesFormProxyModel * mp = dynamic_cast<CGeorgesFormProxyModel *>(_ui.treeView->model()); CGeorgesFormProxyModel * mp = dynamic_cast<CGeorgesFormProxyModel *>(_ui.treeView->model());
CGeorgesFormModel *m = dynamic_cast<CGeorgesFormModel *>(mp->sourceModel()); CGeorgesFormModel *m = dynamic_cast<CGeorgesFormModel *>(mp->sourceModel());
@ -313,4 +313,4 @@ namespace NLQT
} }
} }
} /* namespace NLQT */ } /* namespace NLQT */