Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Sergey Sharybin
2018-05-07 14:20:47 +02:00
parent 5003f894e7 592c3881ba
commit 57013c0a39
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/ghost/intern/GHOST_DropTargetX11.cpp
View File

@@ -192,7 +192,7 @@ void GHOST_DropTargetX11::UrlDecode(char *decodedOut, int bufferSize, const char
char *GHOST_DropTargetX11::FileUrlDecode(char *fileUrl) 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 */ /* assume one character of encoded URL can be expanded to 4 chars max */
int decodedSize = 4 * strlen(fileUrl) + 1; int decodedSize = 4 * strlen(fileUrl) + 1;
char *decodedPath = (char *)malloc(decodedSize); char *decodedPath = (char *)malloc(decodedSize);

2
source/blender/bmesh/tools/bmesh_bevel.c
View File

@@ -5403,7 +5403,7 @@ void BM_mesh_bevel(
} }
/* Perhaps do a pass to try to even out widths */ /* 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); adjust_offsets(&bp);
} }

2
source/blender/editors/sculpt_paint/sculpt.c
View File

@@ -1126,6 +1126,8 @@ static float brush_strength(
case BRUSH_MASK_SMOOTH: case BRUSH_MASK_SMOOTH:
return alpha * pressure * feather; return alpha * pressure * feather;
} }
BLI_assert(!"Not supposed to happen");
break;
case SCULPT_TOOL_CREASE: case SCULPT_TOOL_CREASE:
case SCULPT_TOOL_BLOB: case SCULPT_TOOL_BLOB: