From e5bc9fae54d2906cdc49278ec148343869fede0c Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Sat, 24 Nov 2018 18:23:57 +0100 Subject: Fix penpressure for tablets that use libinput on linux --- intern/ghost/intern/GHOST_SystemX11.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'intern') diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index c8984f0e280..06754bc9300 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -2231,6 +2231,7 @@ static BOOL is_stylus(const char *name, const char *type) "stylus", "wizardpen", "acecad", + "pen", NULL }; @@ -2286,7 +2287,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; -- cgit v1.2.3 From e742e0934de6384eeaf271ca4cfe99922ddbe3fb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 25 Nov 2018 08:01:14 +1100 Subject: Cleanup: trailing space --- intern/cycles/bvh/bvh_embree.cpp | 2 +- intern/cycles/device/device_cpu.cpp | 2 +- intern/cycles/kernel/bvh/bvh_embree.h | 2 +- intern/cycles/kernel/geom/geom_triangle_intersect.h | 2 +- intern/cycles/kernel/kernel_id_passes.h | 2 +- intern/cycles/kernel/kernel_passes.h | 2 +- intern/cycles/render/scene.cpp | 4 ++-- intern/cycles/render/shader.cpp | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'intern') 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/kernel/kernel_id_passes.h b/intern/cycles/kernel/kernel_id_passes.h index ee3b8b8abfb..0cd65b1f2e8 100644 --- a/intern/cycles/kernel/kernel_id_passes.h +++ b/intern/cycles/kernel/kernel_id_passes.h @@ -22,7 +22,7 @@ ccl_device_inline void kernel_write_id_slots(ccl_global float *buffer, int num_s if(weight == 0.0f) { return; } - + for(int slot = 0; slot < num_slots; slot++) { ccl_global float2 *id_buffer = (ccl_global float2*)buffer; #ifdef __ATOMIC_PASS_WRITE__ diff --git a/intern/cycles/kernel/kernel_passes.h b/intern/cycles/kernel/kernel_passes.h index 80477f921ea..1f5929e4938 100644 --- a/intern/cycles/kernel/kernel_passes.h +++ b/intern/cycles/kernel/kernel_passes.h @@ -200,7 +200,7 @@ ccl_device_inline size_t kernel_write_id_pass_cpu(float *buffer, size_t depth, f return 0; } #else /* __KERNEL_CPU__ */ -#define WRITE_ID_SLOT(buffer, depth, id, matte_weight, name) kernel_write_id_slots_gpu(buffer, depth * 2, id, matte_weight) +#define WRITE_ID_SLOT(buffer, depth, id, matte_weight, name) kernel_write_id_slots_gpu(buffer, depth * 2, id, matte_weight) ccl_device_inline size_t kernel_write_id_slots_gpu(ccl_global float *buffer, size_t depth, float id, float matte_weight) { #endif /* __KERNEL_CPU__ */ diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index ccaca8707c8..c96a1b78537 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -215,7 +215,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); @@ -245,7 +245,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/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp index d6c2d7502f2..df16ae800d0 100644 --- a/intern/cycles/render/shader.cpp +++ b/intern/cycles/render/shader.cpp @@ -525,7 +525,7 @@ void ShaderManager::device_update_common(Device *device, flag |= SD_HAS_CONSTANT_EMISSION; uint32_t cryptomatte_id = util_murmur_hash3(shader->name.c_str(), shader->name.length(), 0); - + /* regular shader */ kshader->flags = flag; kshader->pass_id = shader->pass_id; -- cgit v1.2.3