blender
/
blender
135
420
Fork 601
Code Issues 6.3k Pull Requests 765 Projects 19 Wiki Activity

WIP: Fix #116458: Added decay factor for flattening brushes. #118699

Draft
Raul Fernandez Hernandez wants to merge 87 commits from farsthary/blender:Fix-#116458-Sculpt-Clay-strip-sculpts-on-back-face-when-front-face-only-is-turned-on into blender-v4.1-release
pull from: farsthary/blender:Fix-#116458-Sculpt-Clay-strip-sculpts-on-back-face-when-front-face-only-is-turned-on
merge into: blender:blender-v4.1-release

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 16 Commits 87 Files Changed 9 +3 -2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e4cc3c718b - Show all commits

2
source/blender/editors/space_text/text_format_py.cc
View File

@ -349,7 +349,7 @@ static void txtfmt_py_format_line(SpaceText *st, TextLine *line, const bool do_n
/* So slashes beginning on continuation display properly, see: #118767. */
if (cont & (FMT_CONT_QUOTEDOUBLE | FMT_CONT_QUOTESINGLE | FMT_CONT_TRIPLE)) {
prev = FMT_TYPE_STRING;
}
}
}
else {
cont = FMT_CONT_NOP;

3
source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_shadow.cc
View File

@ -764,7 +764,8 @@ static bool lineart_shadow_cast_onto_triangle(LineartData *ld,
* the edge
*/
if (!(pi && LRT_DOUBLE_CLOSE_ENOUGH(ratio[0], 1.0f) &&
LRT_DOUBLE_CLOSE_ENOUGH(ratio[1], 0.0f))) {
LRT_DOUBLE_CLOSE_ENOUGH(ratio[1], 0.0f)))
{
trie[pi] = 1;
pi++;
}