diff --git a/src/meshlabplugins/editpaint/editpaint.cpp b/src/meshlabplugins/editpaint/editpaint.cpp index 28fbbf23d..327f70889 100755 --- a/src/meshlabplugins/editpaint/editpaint.cpp +++ b/src/meshlabplugins/editpaint/editpaint.cpp @@ -119,7 +119,8 @@ void EditPaintPlugin::undo(int value) { } void EditPaintPlugin::StartEdit(QAction * /*mode*/, MeshModel &m, GLArea * parent) { - first=true; + parent->setCursor(QCursor(QPixmap(":/images/cursor_paint.png"),1,1)); + first=true; pressed=0; tri::UpdateBounding::Box(m.cm); if (paintbox==0) { @@ -579,7 +580,7 @@ inline void getSurroundingFacesVF(CFaceO * fac,int vert_pos,vector *su /** finds the faces or vertexes in the circle */ void getInternFaces(MeshModel & m,vector *actual,vector * risult, vector * face_risult, GLArea * gla,Penn &pen,QPoint &cur, QPoint &prev, GLfloat * pixels, - double mvmatrix[16],double projmatrix[16],int viewport[4]) { + double mvmatrix[16],double projmatrix[16],GLint viewport[4]) { QHash selected; QHash sel_vert; diff --git a/src/meshlabplugins/editpaint/editpaint.h b/src/meshlabplugins/editpaint/editpaint.h index 567467260..cf66bc9f3 100755 --- a/src/meshlabplugins/editpaint/editpaint.h +++ b/src/meshlabplugins/editpaint/editpaint.h @@ -94,7 +94,7 @@ private: bool first; // to check in decorate if it is the first call after a mouse down double mvmatrix[16]; //modelview double projmatrix[16]; //projection - int viewport[4]; //viewport + GLint viewport[4]; //viewport GLfloat *pixels; // the z-buffer int inverse_y; // gla->curSiz.height()-cur.y() TODO probably removable vector tempSel; //to use when needed diff --git a/src/meshlabplugins/editpaint/meshlab.qrc b/src/meshlabplugins/editpaint/meshlab.qrc index 46105baa4..5cf86bcce 100755 --- a/src/meshlabplugins/editpaint/meshlab.qrc +++ b/src/meshlabplugins/editpaint/meshlab.qrc @@ -12,5 +12,6 @@ images/undo.png images/redo.png images/gradient.png + images/cursor_paint.png