Merge branch 'master' into revarbat_dev

This commit is contained in:
Revar Desmera 2021-02-19 19:59:59 -08:00 committed by GitHub
commit ef4402c183
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

View file

@ -976,7 +976,6 @@ function offset_sweep(
height = one_defined([l,h,height], "l,h,height", dflt=u_add(bottom_height,top_height)), height = one_defined([l,h,height], "l,h,height", dflt=u_add(bottom_height,top_height)),
middle = height-bottom_height-top_height middle = height-bottom_height-top_height
) )
echo(height=height)
assert(height>0, "Height must be positive") assert(height>0, "Height must be positive")
assert(middle>=0, str("Specified end treatments (bottom height = ",bottom_height, assert(middle>=0, str("Specified end treatments (bottom height = ",bottom_height,
" top_height = ",top_height,") are too large for extrusion height (",height,")" " top_height = ",top_height,") are too large for extrusion height (",height,")"

View file

@ -34,7 +34,7 @@ function _substr(str,pos,len,substr="") =
_substr(str, pos+1, len-1, str(substr, str[pos])); _substr(str, pos+1, len-1, str(substr, str[pos]));
// Function suffix() // Function: suffix()
// Usage: // Usage:
// suffix(str,len) // suffix(str,len)
// Description: // Description:
@ -726,7 +726,7 @@ function str_pad(str,length,char=" ",left=false) =
left ? str(padding,str) : str(str,padding); left ? str(padding,str) : str(str,padding);
// Function str_replace_char() // Function: str_replace_char()
// Usage: // Usage:
// newstr = str_replace_char(str, char, replace) // newstr = str_replace_char(str, char, replace)
// Description: // Description: