forked from bartvdbraak/blender
Fixed bug #5368 retopology - tooltips in header are not shown
This commit is contained in:
parent
da0433e01d
commit
9a9c417d8a
@ -1024,6 +1024,16 @@ void handle_view_wheeldown()
|
|||||||
persptoetsen(PADMINUS);
|
persptoetsen(PADMINUS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int mouse_in_header(ScrArea *sa)
|
||||||
|
{
|
||||||
|
short mouse[2];
|
||||||
|
getmouseco_sc(mouse);
|
||||||
|
return mouse[0] >= sa->headrct.xmin &&
|
||||||
|
mouse[0] <= sa->headrct.xmax &&
|
||||||
|
mouse[1] >= sa->headrct.ymin &&
|
||||||
|
mouse[1] <= sa->headrct.ymax;
|
||||||
|
}
|
||||||
|
|
||||||
static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
|
static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
|
||||||
{
|
{
|
||||||
View3D *v3d= sa->spacedata.first;
|
View3D *v3d= sa->spacedata.first;
|
||||||
@ -1053,21 +1063,23 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
|
|||||||
else if (event==RIGHTMOUSE) event = LEFTMOUSE;
|
else if (event==RIGHTMOUSE) event = LEFTMOUSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!G.obedit && (G.f & G_SCULPTMODE)) {
|
if(!mouse_in_header(sa)) {
|
||||||
if(G.scene->sculptdata.propset) {
|
if(!G.obedit && (G.f & G_SCULPTMODE)) {
|
||||||
sculptmode_propset(event);
|
if(G.scene->sculptdata.propset) {
|
||||||
return;
|
sculptmode_propset(event);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if(event!=LEFTMOUSE && event!=MIDDLEMOUSE && (event==MOUSEY || event==MOUSEX)) {
|
||||||
|
if(!bwin_qtest(sa->win))
|
||||||
|
allqueue(REDRAWVIEW3D, 0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if(event!=LEFTMOUSE && event!=MIDDLEMOUSE && (event==MOUSEY || event==MOUSEX)) {
|
|
||||||
if(!bwin_qtest(sa->win))
|
|
||||||
allqueue(REDRAWVIEW3D, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Handle retopo painting */
|
/* Handle retopo painting */
|
||||||
if(retopo_mesh_paint_check()) {
|
if(retopo_mesh_paint_check()) {
|
||||||
if(!retopo_paint(event))
|
if(!retopo_paint(event))
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* run any view3d event handler script links */
|
/* run any view3d event handler script links */
|
||||||
|
Loading…
Reference in New Issue
Block a user