From 8148d549bbe8afdbf3116c2083d30ac288ac7a1b Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 15 Jun 2018 10:06:32 +0200 Subject: [PATCH 1/2] Fix Cycles CUDA error after recent changes. --- intern/cycles/kernel/CMakeLists.txt | 1 + intern/cycles/kernel/kernel_types.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 457602ae4e7..b1956bfb13a 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -82,6 +82,7 @@ set(SRC_HEADERS kernel_accumulate.h kernel_bake.h kernel_camera.h + kernel_color.h kernel_compat_cpu.h kernel_compat_cuda.h kernel_compat_opencl.h diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 633518c7926..e8cbd330184 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -1272,13 +1272,13 @@ typedef struct KernelFilm { int pass_denoising_clean; int denoising_flags; + int pad1, pad2, pad3; + float3 xyz_to_r; float3 xyz_to_g; float3 xyz_to_b; float3 rgb_to_y; - int pad1, pad2, pad3; - #ifdef __KERNEL_DEBUG__ int pass_bvh_traversed_nodes; int pass_bvh_traversed_instances; From 284e0ea756854e3d8388b2cd89666923975cbf10 Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Fri, 15 Jun 2018 10:25:18 +0200 Subject: [PATCH 2/2] Fix (unreported) Text Editor: scrollbar exiting early caused by recent clickdrag changes --- source/blender/editors/space_text/text_ops.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index de5ff36f462..52440be4c4b 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -2243,13 +2243,15 @@ static int text_scroll_modal(bContext *C, wmOperator *op, const wmEvent *event) case LEFTMOUSE: case RIGHTMOUSE: case MIDDLEMOUSE: - if (ELEM(tsc->zone, SCROLLHANDLE_MIN_OUTSIDE, SCROLLHANDLE_MAX_OUTSIDE)) { - txt_screen_skip(st, ar, st->viewlines * (tsc->zone == SCROLLHANDLE_MIN_OUTSIDE ? 1 : -1)); + if (event->val == KM_RELEASE) { + if (ELEM(tsc->zone, SCROLLHANDLE_MIN_OUTSIDE, SCROLLHANDLE_MAX_OUTSIDE)) { + txt_screen_skip(st, ar, st->viewlines * (tsc->zone == SCROLLHANDLE_MIN_OUTSIDE ? 1 : -1)); - ED_area_tag_redraw(CTX_wm_area(C)); + ED_area_tag_redraw(CTX_wm_area(C)); + } + scroll_exit(C, op); + return OPERATOR_FINISHED; } - scroll_exit(C, op); - return OPERATOR_FINISHED; } return OPERATOR_RUNNING_MODAL;