Commit 72ba5934 authored by Jan Möbius's avatar Jan Möbius
Browse files

Fixed wrong return in ACG Shadernode (bool instead of 0 pointer)

Fixed wrong signature of size hint function



git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@14471 383ad7c9-94d9-4d36-a494-682f7c89f535
parent b48d6fe9
......@@ -224,7 +224,7 @@ getShader( DrawModes::DrawMode _drawmode, bool _pick ) {
if ( !_drawmode.isAtomic() ) {
std::cerr << "getShader: Error, draw mode not atomic!" << std::endl;
return false;
return 0;
}
std::map<unsigned int,ShaderInfo>::iterator it;
......
......@@ -238,10 +238,10 @@ glViewer::~glViewer()
//-----------------------------------------------------------------------------
QSize
glViewer::sizeHint() const
QSizeF
glViewer::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const
{
return QSize( 600, 600 );
return QSizeF( 600, 600 );
}
//-----------------------------------------------------------------------------
......
......@@ -152,7 +152,6 @@ public:
//------------------------------------------------------------- public methods
virtual QSize sizeHint () const;
/// Makes this widget the current widget for OpenGL operations.
virtual void makeCurrent();
......@@ -422,6 +421,10 @@ protected:
friend class SimpleGLGraphicsScene;
friend class QtGLGraphicsView;
/// Return a resonable size hint
virtual QSizeF sizeHint (Qt::SizeHint which, const QSizeF & constraint) const;
/// initialize OpenGL states
virtual void initializeGL();
/// draw the scene. Triggered by updateGL().
......
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