[Bf-blender-cvs] [8ca4337bdf1] temp-trimesh-sculpt: * Fixed undo with bmesh dyntopo

[Joseph Eagar]

Commit: 8ca4337bdf1490ec43f982e9c9427614239b685e
Author: Joseph Eagar
Date:   Fri Oct 23 17:42:22 2020 -0700
Branches: temp-trimesh-sculpt
https://developer.blender.org/rB8ca4337bdf1490ec43f982e9c9427614239b685e

* Fixed undo with bmesh dyntopo

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

M	source/blender/blenkernel/intern/pbvh_bmesh.c
M	source/blender/editors/sculpt_paint/sculpt_undo.c
M	source/blender/editors/space_info/info_stats.c

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

diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c
index 0d31494daa8..73988e53bb2 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -1998,6 +1998,7 @@ bool BKE_pbvh_bmesh_update_topology(PBVH *pbvh,
                                     const bool use_projected,
                                     int sym_axis)
 {
+  return false;
   if (sym_axis >= 0 &&
       PIL_check_seconds_timer() - last_update_time[sym_axis] < DYNTOPO_RUN_INTERVAL) {
     return false;
diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c
index d73298204b3..7452133bae7 100644
--- a/source/blender/editors/sculpt_paint/sculpt_undo.c
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.c
@@ -456,8 +456,6 @@ static void sculpt_undo_bmesh_restore_generic_task_cb(
 
 static void sculpt_undo_bmesh_restore_generic(SculptUndoNode *unode, Object *ob, SculptSession *ss)
 {
-  // XXX
-  return;
   if (unode->applied) {
     BM_log_undo(ss->bm, ss->bm_log);
     unode->applied = false;
diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c
index 88389a463f2..5df3b0241eb 100644
--- a/source/blender/editors/space_info/info_stats.c
+++ b/source/blender/editors/space_info/info_stats.c
@@ -366,7 +366,7 @@ static void stats_object_sculpt_dynamic_topology(Object *ob, SceneStats *stats)
 
 static bool stats_is_object_dynamic_topology_sculpt(Object *ob, const eObjectMode object_mode)
 {
-  return (ob && (object_mode & OB_MODE_SCULPT) && ob->sculpt && ob->sculpt->tm);
+  return (ob && (object_mode & OB_MODE_SCULPT) && ob->sculpt && (ob->sculpt->tm || ob->sculpt->bm));
 }
 
 /* Statistics displayed in info header. Called regularly on scene changes. */