Commit 8b98e2ab authored by Jan Möbius's avatar Jan Möbius

Trying to get rid of some cppcheck warnings


git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@16834 383ad7c9-94d9-4d36-a494-682f7c89f535
parent a0140f2b
......@@ -56,6 +56,7 @@ VolumeMeshBufferManager<VolumeMesh>::VolumeMeshBufferManager(const VolumeMesh &m
mNormalAttrib(normalAttrib_),
mNumOfVertices(-1),
mCurrentNumOfVertices(-1),
mVertexSize(0),
mColorOffset(-1),
mNormalOffset(-1),
mScale(0.8),
......@@ -82,6 +83,7 @@ VolumeMeshBufferManager<VolumeMesh>::VolumeMeshBufferManager(const VolumeMesh &m
mCurrentShowIrregularOuterValence2Edges(false),
mCurrentSkipRegularEdges(false),
mCurrentBoundaryOnly(false),
mCurrentVertexSize(0),
mCurrentNormalOffset(0),
mCurrentColorOffset(0),
mCogsValid(false),
......
......@@ -73,7 +73,9 @@ ScriptingPlugin::ScriptingPlugin() :
lastFile_(""),
debuggerButton_(0)
#ifdef ENABLE_SCRIPT_DEBUGGER
#ifdef QT_SCRIPTTOOLS_LIB
,debugger_(0)
#endif
#endif
{
......@@ -219,12 +221,14 @@ void ScriptingPlugin::pluginsInitialized() {
// ==================================================================
#ifdef ENABLE_SCRIPT_DEBUGGER
#ifdef QT_SCRIPTTOOLS_LIB
QScriptEngine* engine;
emit getScriptingEngine( engine );
debugger_ = new QScriptEngineDebugger;
if ( OpenFlipperSettings().value("Scripting/QtScriptDebugger",false).toBool() )
debugger_->attachTo(engine);
#endif
#endif
}
......@@ -413,6 +417,7 @@ void ScriptingPlugin::slotExecuteScriptButton() {
void ScriptingPlugin::slotDebuggerButton() {
#ifdef ENABLE_SCRIPT_DEBUGGER
#ifdef QT_SCRIPTTOOLS_LIB
QScriptEngine* engine;
emit getScriptingEngine( engine );
......@@ -423,7 +428,7 @@ void ScriptingPlugin::slotDebuggerButton() {
}
OpenFlipperSettings().setValue("Scripting/QtScriptDebugger",debuggerButton_->isChecked());
#endif
#endif
}
......
......@@ -232,8 +232,10 @@ private :
QAction* debuggerButton_;
#ifdef QT_SCRIPTTOOLS_LIB
#ifdef ENABLE_SCRIPT_DEBUGGER
#ifdef QT_SCRIPTTOOLS_LIB
QScriptEngineDebugger* debugger_;
#endif
#endif
......
......@@ -527,7 +527,7 @@ void DepthPeeling::renderDualPeeling(ACG::GLState* _glState, Viewer::ViewerPrope
targetBuffer[0] = GL_COLOR_ATTACHMENT0 + bufID;
targetBuffer[1] = GL_COLOR_ATTACHMENT1 + bufID;
targetBuffer[2] = GL_COLOR_ATTACHMENT2 + bufID;
GLenum sourceBuffer[] = {GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2};
// GLenum sourceBuffer[] = {GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2};
// clear target colors
glDrawBuffers(2, targetBuffer + 1);
......
......@@ -144,7 +144,6 @@ private:
/// dual depth peeling shaders
GLSL::Program* peelBlendDual_;
GLSL::Program* peelFinalDual_;
GLSL::Program* peelInitDual_;
/// Collection of framebuffers for each viewport
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment