diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.def b/code/nel/src/3d/driver/opengl/driver_opengl.def index 2e32d9601..bfe648552 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl.def +++ b/code/nel/src/3d/driver/opengl/driver_opengl.def @@ -1,2 +1,2 @@ EXPORTS NL3D_createIDriverInstance -EXPORTS NL3D_interfaceVersion \ No newline at end of file +EXPORTS NL3D_interfaceVersion diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp index 6b0dccbea..4eac76125 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp @@ -743,9 +743,8 @@ void CDriverGLStates::enableVertexArray(bool enable) glEnableClientState(GL_VERTEX_ARRAY); else glDisableClientState(GL_VERTEX_ARRAY); + _VertexArrayEnabled= enable; - - } } // *************************************************************************** diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp index 93fcd4399..b67648e66 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp @@ -1016,7 +1016,6 @@ void CDriverGL::toggleGlArraysForNVVertexProgram() _DriverGLStates.enableTexCoordArray(false); } - // now, vertex program setup. _LastSetupGLArrayVertexProgram= true; } @@ -1080,6 +1079,7 @@ void CDriverGL::toggleGlArraysForARBVertexProgram() _DriverGLStates.clientActiveTextureARB(i); _DriverGLStates.enableTexCoordArray(false); } + // now, vertex program setup. _LastSetupGLArrayVertexProgram= true; } @@ -1129,7 +1129,6 @@ void CDriverGL::toggleGlArraysForEXTVertexShader() _DriverGLStates.enableTexCoordArray(false); } - // now, vertex program setup. _LastSetupGLArrayVertexProgram= true; } diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp index 6534c15d7..8f9087885 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp @@ -223,13 +223,13 @@ namespace NLQT // Get the left view //CView* pView = getLeftView (); } - } - catch (Exception &e) + } + catch (Exception &e) { nlerror("Error while loading file: %s", e.what()); } - } - else + } + else { //if (!file.open()) nlerror("Can't open the file %s for writing.", s); } @@ -237,7 +237,7 @@ namespace NLQT void CGeorgesTreeViewDialog::doubleClicked ( const QModelIndex & index ) { - if (index.column() == 1) + if (index.column() == 1) return; CFormItem *item = static_cast(index.internalPointer()); @@ -247,7 +247,7 @@ namespace NLQT if (!path.isEmpty() && !path.contains(".shape")) Q_EMIT changeFile(path); - if (path.contains(".shape")) + if (path.contains(".shape")) { Modules::objView().resetScene(); Modules::config().configRemapExtensions(); @@ -258,22 +258,22 @@ namespace NLQT void CGeorgesTreeViewDialog::closeEvent(QCloseEvent *event) { - if (Modules::mainWin().getEmptyView() == this) + if (Modules::mainWin().getEmptyView() == this) { event->ignore(); - } - else + } + else { Modules::mainWin().getTreeViewList().removeOne(this); - if(!Modules::mainWin().getTreeViewList().size()) + if(!Modules::mainWin().getTreeViewList().size()) { Modules::mainWin().createEmptyView(); } deleteLater(); - } + } } - void CGeorgesTreeViewDialog::showParentRows(int newState) + void CGeorgesTreeViewDialog::showParentRows(int newState) { CGeorgesFormProxyModel * mp = dynamic_cast(_ui.treeView->model()); CGeorgesFormModel *m = dynamic_cast(mp->sourceModel()); @@ -313,4 +313,4 @@ namespace NLQT } } -} /* namespace NLQT */ \ No newline at end of file +} /* namespace NLQT */