blender
/
blender
137
416
Fork 599
Code Issues 6.3k Pull Requests 774 Projects 19 Wiki Activity

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 381 commits from brush-assets-project into main
pull from: brush-assets-project
merge into: blender:main

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

6
source/blender/editors/sculpt_paint/paint_weight.cc
View File

@ -1538,11 +1538,11 @@ static void wpaint_paint_leaves(bContext *C,
/** \name Enter Weight Paint Mode /** \name Enter Weight Paint Mode
* \{ */ * \{ */
static void grease_pencil_wpaintmode_enter(Scene *scene, Object *ob) static void grease_pencil_wpaintmode_enter(Main *bmain, Scene *scene, Object *ob)
{ {
const PaintMode paint_mode = PaintMode::Weight; const PaintMode paint_mode = PaintMode::Weight;
Paint *weight_paint = BKE_paint_get_active_from_paintmode(scene, paint_mode); Paint *weight_paint = BKE_paint_get_active_from_paintmode(scene, paint_mode);
BKE_paint_ensure(scene->toolsettings, &weight_paint); BKE_paint_ensure(bmain, scene->toolsettings, &weight_paint);
ob->mode |= OB_MODE_WEIGHT_PAINT; ob->mode |= OB_MODE_WEIGHT_PAINT;
@ -1557,7 +1557,7 @@ void ED_object_wpaintmode_enter_ex(Main *bmain, Depsgraph *depsgraph, Scene *sce
vwpaint::mode_enter_generic(bmain, depsgraph, scene, ob, OB_MODE_WEIGHT_PAINT); vwpaint::mode_enter_generic(bmain, depsgraph, scene, ob, OB_MODE_WEIGHT_PAINT);
break; break;
case OB_GREASE_PENCIL: case OB_GREASE_PENCIL:
grease_pencil_wpaintmode_enter(scene, ob); grease_pencil_wpaintmode_enter(bmain, scene, ob);
break; break;
default: default:
BLI_assert_unreachable(); BLI_assert_unreachable();