From 26dab9c2fe15ff2686f92280ee759c2d2cbf299e Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 25 Apr 2018 12:27:01 +0200 Subject: [PATCH 1/2] Buildbot: Attempt to link against Blosc statically Was broken by f1e6838376a. --- build_files/buildbot/config/blender_linux.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index b41c94494d1..a405ae95fff 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -140,6 +140,10 @@ set(ZLIB_LIBRARY "/usr/lib${MULTILIB}/libz.a" CACHE STRING "" FORCE) # OpenVDB set(OPENVDB_LIBRARY /opt/lib/openvdb/lib/libopenvdb.a + CACHE BOOL "" FORCE +) + +set(BLOSC_LIBRARY /opt/lib/blosc/lib/libblosc.a CACHE BOOL "" FORCE ) From 03574930338b6e85bf7bc2aefde2d2daeb7d89a2 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 25 Apr 2018 13:07:22 +0200 Subject: [PATCH 2/2] Fix T54806: Editors drawing glitch when using lasso selection We should always reset to default glBlendFunc after done drawing. --- source/blender/windowmanager/intern/wm_gesture.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index 6da9101156a..c2331f44056 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -323,6 +323,7 @@ static void draw_filled_lasso(wmGesture *gt) MEM_freeN(pixel_buf); glDisable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); } MEM_freeN(moves);