diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-05-30 20:31:17 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-05-30 20:31:17 +0300 |
| commit | d5f0092273e86e961e34eee88dbefe566edee4e9 (patch) | |
| tree | f7e0d2048a1f7f8e34148868e6f4bde67bd8e20d /source | |
| parent | e7d4cb1c67f7a794a45f8a55be9f5aa8e453f76d (diff) | |
| parent | 831282db851157072abd229ad3c0cd15e58cd487 (diff) | |
Merge branch 'temp-legacy-mesh-format-option' into refactor-mesh-bevel-weight-generic
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_convert.cc | 3 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_draw.cc | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.cc b/source/blender/bmesh/intern/bmesh_mesh_convert.cc index a797efe36a5..890456f9024 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_convert.cc +++ b/source/blender/bmesh/intern/bmesh_mesh_convert.cc @@ -197,9 +197,6 @@ void BM_mesh_bm_from_me(BMesh *bm, const Mesh *me, const struct BMeshFromMeshPar return; /* Sanity check. */ } - /* Only copy normals to the new BMesh if they are not already dirty. This avoids unnecessary - * work, but also accessing normals on an incomplete mesh, for example when restoring undo steps - * in edit mode. */ const float(*vert_normals)[3] = nullptr; if (params->calc_vert_normal) { vert_normals = BKE_mesh_vertex_normals_ensure(me); diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc index 4d194dfbd38..e0ff4212a94 100644 --- a/source/blender/editors/space_node/node_draw.cc +++ b/source/blender/editors/space_node/node_draw.cc @@ -2654,7 +2654,7 @@ static void frame_node_draw_label(const bNodeTree &ntree, BLF_enable(fontid, BLF_ASPECT); BLF_aspect(fontid, aspect, aspect, 1.0f); /* clamp otherwise it can suck up a LOT of memory */ - BLF_size(fontid, MIN2(24.0f, font_size), U.dpi); + BLF_size(fontid, MIN2(24.0f, font_size) * U.pixelsize, U.dpi); /* title color */ int color_id = node_get_colorid(node); |