Merge branch 'master' into blender2.8

6 files changed, 9 insertions, 7 deletions

diff --git a/intern/cycles/bvh/bvh_embree.cpp b/intern/cycles/bvh/bvh_embree.cpp
index 7489fe8ea42..2d6efe8dad5 100644
--- a/intern/cycles/bvh/bvh_embree.cpp
+++ b/intern/cycles/bvh/bvh_embree.cpp
@@ -597,7 +597,7 @@ void BVHEmbree::update_curve_vertex_buffer(RTCGeometry geom_id, const Mesh* mesh
 			num_motion_steps = mesh->motion_steps;
 		}
 	}
-	
+
 	const size_t num_curves = mesh->num_curves();
 	size_t num_keys = 0;
 	for(size_t j = 0; j < num_curves; ++j) {
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index 76f6466bbde..36fe9bfc92b 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -707,7 +707,7 @@ public:
 
 		_MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON);
 		_MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON);
-		
+
 		for(int sample = start_sample; sample < end_sample; sample++) {
 			if(task.get_cancel() || task_pool.canceled()) {
 				if(task.need_finish_queue == false)
diff --git a/intern/cycles/kernel/bvh/bvh_embree.h b/intern/cycles/kernel/bvh/bvh_embree.h
index 34a099ebb4d..bfc911a1e76 100644
--- a/intern/cycles/kernel/bvh/bvh_embree.h
+++ b/intern/cycles/kernel/bvh/bvh_embree.h
@@ -30,7 +30,7 @@ struct CCLIntersectContext  {
 		RAY_SHADOW_ALL = 1,
 		RAY_SSS = 2,
 		RAY_VOLUME_ALL = 3,
-		
+
 	} RayType;
 
 	KernelGlobals *kg;
diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h
index 57f4c86d403..56dbc4473fa 100644
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h
@@ -210,7 +210,7 @@ ccl_device_inline int ray_triangle_intersect8(
 	unsigned char mask_sign_T = _mm256_movemask_ps(sign_T_256);
 	if(((mask_minmaxUVW_pos | mask_sign_T) & prim_num_mask) == prim_num_mask) {
 		return false;
-	} 
+	}
 
 	__m256 xor_signmask_256 = _mm256_castsi256_ps(_mm256_xor_si256(_mm256_castps_si256(den_256), sign_den_256));
 
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index 2241d8d9c69..23233b4e29e 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -218,7 +218,7 @@ void Scene::device_update(Device *device_, Progress& progress)
 	object_manager->device_update(device, &dscene, this, progress);
 
 	if(progress.get_cancel() || device->have_error()) return;
-	
+
 	progress.set_status("Updating Hair Systems");
 	curve_system_manager->device_update(device, &dscene, this, progress);
 
@@ -248,7 +248,7 @@ void Scene::device_update(Device *device_, Progress& progress)
 	camera->device_update_volume(device, &dscene, this);
 
 	if(progress.get_cancel() || device->have_error()) return;
-	
+
 	progress.set_status("Updating Lookup Tables");
 	lookup_tables->device_update(device, &dscene);
 
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index 37a2c50c442..344e893bb08 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -2329,6 +2329,7 @@ static BOOL is_stylus(const char *name, const char *type)
 		"stylus",
 		"wizardpen",
 		"acecad",
+		"pen",
 		NULL
 	};
 
@@ -2384,7 +2385,8 @@ void GHOST_SystemX11::refreshXInputDevices()
 
 
 				if ((m_xtablet.StylusDevice == NULL) &&
-				    (is_stylus(device_info[i].name, device_type) || (device_info[i].type == m_atom.TABLET)))
+				    (is_stylus(device_info[i].name, device_type) && (device_info[i].type != m_atom.TABLET)))
+				    /* for libinput to work reliable, only lookup ValuatorClass in Tablet type:'STYLUS' */
 				{
 //					printf("\tfound stylus\n");
 					m_xtablet.StylusID = device_info[i].id;