[Bf-blender-cvs] [5fde4ab1c2f] sculpt-mode-features: Fix build after last commit

Pablo Dobarro noreply at git.blender.org
Sun Jun 2 23:02:30 CEST 2019


Commit: 5fde4ab1c2f7306c75e0aee3226cd88d0a1473ea
Author: Pablo Dobarro
Date:   Sun Jun 2 23:01:53 2019 +0200
Branches: sculpt-mode-features
https://developer.blender.org/rB5fde4ab1c2f7306c75e0aee3226cd88d0a1473ea

Fix build after last commit

I forgot to add a couple of files

===================================================================

M	source/blender/editors/object/object_edit.c
M	source/blender/editors/sculpt_paint/sculpt_undo.c

===================================================================

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index a70a48a2c5a..32d6abd8ce6 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1827,9 +1827,7 @@ static int remesh_exec(bContext *C, wmOperator *op)
 
     if (ob->mode == OB_MODE_SCULPT) {
       Depsgraph *depsgraph = CTX_data_depsgraph(C);
-      struct Scene *scene = CTX_data_scene(C);
-      Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
-      BKE_sculpt_update_mesh_elements(depsgraph, scene, sd, ob, true, true);
+      BKE_sculpt_update_object_for_edit(depsgraph, ob, true, true);
       PBVH *pbvh;
       PBVHNode **nodes;
       int totnode;
diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c
index 72cc91d83ab..9c378bf264b 100644
--- a/source/blender/editors/sculpt_paint/sculpt_undo.c
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.c
@@ -622,7 +622,7 @@ static void sculpt_undo_restore_list(bContext *C, ListBase *lb)
     BKE_ptcache_object_reset(scene, ob, PTCACHE_RESET_OUTDATED);
     DEG_relations_tag_update(bmain);
     DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
-    BKE_sculpt_update_mesh_elements(depsgraph, scene, sd, ob, false, false);
+    BKE_sculpt_update_object_for_edit(depsgraph, ob, false, true);
     WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
     WM_main_add_notifier(NC_OBJECT | ND_DRAW, ob);
   }



More information about the Bf-blender-cvs mailing list