From 9eb5aa32b843fdc7be5a7be264909170b725874c Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Mon, 7 May 2018 12:28:15 +0200 Subject: [PATCH 1/4] Fix T54324: remove stencil entries from weight paint keymap Reviewed By: mont29 Differential Revision: http://developer.blender.org/D3178 --- source/blender/editors/sculpt_paint/paint_ops.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index 004d2757a71..572d969dcca 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -1376,8 +1376,6 @@ void ED_keymap_paint(wmKeyConfig *keyconf) ed_keymap_paint_brush_size(keymap, "tool_settings.weight_paint.brush.size"); ed_keymap_paint_brush_radial_control(keymap, "weight_paint", RC_WEIGHT); - ed_keymap_stencil(keymap); - kmi = WM_keymap_add_item(keymap, "WM_OT_context_menu_enum", EKEY, KM_PRESS, 0, 0); RNA_string_set(kmi->ptr, "data_path", "tool_settings.vertex_paint.brush.stroke_method"); From cd3f5983cd219daa4acad1a09d949fac087d2211 Mon Sep 17 00:00:00 2001 From: Howard Trickey Date: Mon, 7 May 2018 07:04:12 -0400 Subject: [PATCH 2/4] Fix Bevel percent mode bug 54228 Previous new adjust pass commit should have excluded percent mode. --- source/blender/bmesh/tools/bmesh_bevel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 457e74ce1aa..ca96e5b4b78 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -5403,7 +5403,7 @@ void BM_mesh_bevel( } /* Perhaps do a pass to try to even out widths */ - if (!bp.vertex_only && bp.offset_adjust) { + if (!bp.vertex_only && bp.offset_adjust && bp.offset_type != BEVEL_AMT_PERCENT) { adjust_offsets(&bp); } From 1a3fb3e8b1ef1e43adb4e082c09a10caad805880 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 7 May 2018 14:08:33 +0200 Subject: [PATCH 3/4] Fix wrong comparison of drop target URI on X11 Need to compare, NOT to override passed file name. --- intern/ghost/intern/GHOST_DropTargetX11.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intern/ghost/intern/GHOST_DropTargetX11.cpp b/intern/ghost/intern/GHOST_DropTargetX11.cpp index 0efc8a78df5..30ab843c593 100644 --- a/intern/ghost/intern/GHOST_DropTargetX11.cpp +++ b/intern/ghost/intern/GHOST_DropTargetX11.cpp @@ -192,7 +192,7 @@ void GHOST_DropTargetX11::UrlDecode(char *decodedOut, int bufferSize, const char char *GHOST_DropTargetX11::FileUrlDecode(char *fileUrl) { - if (strncpy(fileUrl, "file://", 7) != 0) { + if (strncmp(fileUrl, "file://", 7) == 0) { /* assume one character of encoded URL can be expanded to 4 chars max */ int decodedSize = 4 * strlen(fileUrl) + 1; char *decodedPath = (char *)malloc(decodedSize); From 592c3881bae4b063e88444d8341aa5b488b5abb5 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 7 May 2018 14:19:12 +0200 Subject: [PATCH 4/4] Silence compilation error around possible fall-through --- source/blender/editors/sculpt_paint/sculpt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 34e60187a73..cc462631647 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -1129,6 +1129,8 @@ static float brush_strength( case BRUSH_MASK_SMOOTH: return alpha * pressure * feather; } + BLI_assert(!"Not supposed to happen"); + break; case SCULPT_TOOL_CREASE: case SCULPT_TOOL_BLOB: