Merge branch 'master' into blender2.8
This commit is contained in:
commit
57013c0a39
@ -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);
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user