[Bf-blender-cvs] [31aefdeec5a] master: Fix T72028: Crash switching to vertex paint
Philipp Oeser
noreply at git.blender.org
Tue Mar 3 19:47:04 CET 2020
Commit: 31aefdeec5a6e098acabee80517aa6ca03933808
Author: Philipp Oeser
Date: Tue Mar 3 17:22:52 2020 +0100
Branches: master
https://developer.blender.org/rB31aefdeec5a6e098acabee80517aa6ca03933808
Fix T72028: Crash switching to vertex paint
This would happen when done from editmode, on a mesh with any modifier,
after adding/removing geometry in editmode.
Similar to rBba0870713b9b (which did this for weightpaint and sculpt
already), ensure an evaluated depsgraph, otherwise
'runtime.mesh_deform_eval' would not be up to date causing problems
later.
Maniphest Tasks: T72028
Differential Revision: https://developer.blender.org/D7011
===================================================================
M source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index 6971182e5b8..684f53971a7 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -2524,6 +2524,9 @@ static int vpaint_mode_toggle_exec(bContext *C, wmOperator *op)
}
else {
Depsgraph *depsgraph = CTX_data_depsgraph_on_load(C);
+ if (depsgraph) {
+ depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
+ }
wmWindowManager *wm = CTX_wm_manager(C);
ED_object_vpaintmode_enter_ex(bmain, depsgraph, wm, scene, ob);
BKE_paint_toolslots_brush_validate(bmain, &ts->vpaint->paint);
More information about the Bf-blender-cvs
mailing list