diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-07 15:20:47 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-07 15:20:47 +0300 |
commit | 57013c0a39ac75f22eda1a76bb18881fa590b18a (patch) | |
tree | 14a0d1731279390b3002196f6f85ac46621ff0be | |
parent | 5003f894e75fdc6420f5d28bf53cce7018923979 (diff) | |
parent | 592c3881bae4b063e88444d8341aa5b488b5abb5 (diff) |
Merge branch 'master' into blender2.8
-rw-r--r-- | intern/ghost/intern/GHOST_DropTargetX11.cpp | 2 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 2 |
3 files changed, 4 insertions, 2 deletions
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); 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); } diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 9817ca41832..38fbb609283 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -1126,6 +1126,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: |