[Bf-blender-cvs] [ddb21b01beb] profiler-editor: improve profiling

Jacques Lucke noreply at git.blender.org
Thu Apr 29 11:30:49 CEST 2021


Commit: ddb21b01bebff18be34e7ad227b2ec765e930f19
Author: Jacques Lucke
Date:   Tue Apr 27 18:32:16 2021 +0200
Branches: profiler-editor
https://developer.blender.org/rBddb21b01bebff18be34e7ad227b2ec765e930f19

improve profiling

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

M	source/blender/blenkernel/intern/DerivedMesh.cc
M	source/blender/editors/space_profiler/profiler_draw.cc

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

diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc
index f3c6d9f9687..238d4f961e5 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.cc
+++ b/source/blender/blenkernel/intern/DerivedMesh.cc
@@ -1218,6 +1218,7 @@ static void mesh_calc_modifiers(struct Depsgraph *depsgraph,
         }
         BKE_mesh_vert_coords_apply(mesh_final, deformed_verts);
       }
+      BLI_PROFILE_SCOPE(md->name);
       BKE_modifier_deform_verts(md, &mectx, mesh_final, deformed_verts, num_deformed_verts);
     }
     else {
@@ -1694,6 +1695,7 @@ static void editbmesh_calc_modifiers(struct Depsgraph *depsgraph,
         BKE_mesh_vert_coords_apply(mesh_final, deformed_verts);
       }
 
+      BLI_PROFILE_SCOPE(md->name);
       if (mti->deformVertsEM) {
         BKE_modifier_deform_vertsEM(
             md, &mectx, em_input, mesh_final, deformed_verts, num_deformed_verts);
diff --git a/source/blender/editors/space_profiler/profiler_draw.cc b/source/blender/editors/space_profiler/profiler_draw.cc
index 7bad79d28e8..b447bd649a4 100644
--- a/source/blender/editors/space_profiler/profiler_draw.cc
+++ b/source/blender/editors/space_profiler/profiler_draw.cc
@@ -136,7 +136,7 @@ class ProfilerDrawer {
 
     const int left_x = this->time_to_x(node.begin_time());
     const int right_x = std::max(left_x + 1, this->time_to_x(node.end_time()));
-    immRecti(pos, left_x, node.top_y, right_x, node.bottom_y);
+    immRecti(pos, left_x, node.top_y, right_x, node.top_y - row_height_);
 
     immUnbindProgram();
 
@@ -154,7 +154,7 @@ class ProfilerDrawer {
     const int width = std::max(1, std::min<int>(right_x, region_->winx) - x);
 
     uiBut *but = uiDefIconTextBut(ui_block_,
-                                  UI_BTYPE_LABEL,
+                                  UI_BTYPE_BUT,
                                   0,
                                   ICON_NONE,
                                   node.name().c_str(),



More information about the Bf-blender-cvs mailing list