bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Bastien Montagne 2018-12-05 14:41:00 +01:00
commit fb3f1a3567
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/build_environment/install_deps.sh
View File

@ -378,7 +378,7 @@ ALEMBIC_FORCE_BUILD=false
ALEMBIC_FORCE_REBUILD=false
ALEMBIC_SKIP=false
OPENCOLLADA_VERSION="1.6.63"
OPENCOLLADA_VERSION="1.6.68"
OPENCOLLADA_FORCE_BUILD=false
OPENCOLLADA_FORCE_REBUILD=false
OPENCOLLADA_SKIP=false

14
intern/ghost/intern/GHOST_SystemX11.cpp
View File

@ -2367,6 +2367,8 @@ void GHOST_SystemX11::refreshXInputDevices()
if (m_xtablet.StylusDevice != NULL) {
/* Find how many pressure levels tablet has */
XAnyClassPtr ici = device_info[i].inputclassinfo;
bool found_valuator_class = false;
for (int j = 0; j < m_xtablet.StylusDevice->num_classes; ++j) {
if (ici->c_class == ValuatorClass) {
// printf("\t\tfound ValuatorClass\n");
@ -2384,11 +2386,23 @@ void GHOST_SystemX11::refreshXInputDevices()
m_xtablet.YtiltLevels = 0;
}
found_valuator_class = true;
break;
}
ici = (XAnyClassPtr)(((char *)ici) + ici->length);
}
if (!found_valuator_class) {
/* In case our name matching detects a device that
* isn't actually a stylus. For example there can
* be "XPPEN Tablet" and "XPPEN Tablet Pen", but
* only the latter is a stylus. */
XCloseDevice(m_display, m_xtablet.StylusDevice);
m_xtablet.StylusDevice = NULL;
m_xtablet.StylusID = 0;
}
}
else {
m_xtablet.StylusID = 0;