Merge branch 'dev' into newlocallab

This commit is contained in:
heckflosse
2018-09-15 20:53:21 +02:00
178 changed files with 4228 additions and 3683 deletions

View File

@@ -784,9 +784,8 @@ inline EditDataProvider* EditSubscriber::getEditProvider ()
return provider;
}
inline CursorShape EditSubscriber::getCursor (const int objectID)
{
return CSOpenHand;
inline CursorShape EditSubscriber::getCursor (const int objectID) {
return CSHandOpen;
}
inline bool EditSubscriber::mouseOver (const int modifierKey)