Merge branch 'master' into blender2.8

This commit is contained in:
Sergey Sharybin 2018-07-10 11:23:10 +02:00
commit 0bfc06b7b7

@ -1677,6 +1677,7 @@ getDPIHint()
}
}
}
XrmDestroyDatabase(xrdb);
}
/* Fallback to calculating DPI using X reported DPI, set using xrandr --dpi */