[Bf-blender-cvs] [c7e28f25d58] blender-v2.82-release: Fix T72028: Crash switching to vertex paint

Philipp Oeser noreply at git.blender.org
Tue Mar 10 13:53:10 CET 2020


Commit: c7e28f25d58ab1277712e6d8ed6293f8d39e1758
Author: Philipp Oeser
Date:   Tue Mar 3 17:22:52 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rBc7e28f25d58ab1277712e6d8ed6293f8d39e1758

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 cafdd72c7cd..7b4a0e7313c 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -2529,6 +2529,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