[Bf-blender-cvs] [9d8b53abf8c] refactor-mesh-remove-pointers: Add "using" for Span

Hans Goudey noreply at git.blender.org
Fri Sep 2 01:12:16 CEST 2022


Commit: 9d8b53abf8c40b2b6809a34c76137d1b6726b62d
Author: Hans Goudey
Date:   Thu Sep 1 17:27:18 2022 -0500
Branches: refactor-mesh-remove-pointers
https://developer.blender.org/rB9d8b53abf8c40b2b6809a34c76137d1b6726b62d

Add "using" for Span

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

M	source/blender/blenkernel/intern/paint.cc

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

diff --git a/source/blender/blenkernel/intern/paint.cc b/source/blender/blenkernel/intern/paint.cc
index 88bebc2f813..10dfa3f59e7 100644
--- a/source/blender/blenkernel/intern/paint.cc
+++ b/source/blender/blenkernel/intern/paint.cc
@@ -64,6 +64,9 @@
 
 #include "bmesh.h"
 
+using blender::MutableSpan;
+using blender::Span;
+
 static void palette_init_data(ID *id)
 {
   Palette *palette = (Palette *)id;
@@ -1950,8 +1953,8 @@ void BKE_sculpt_update_object_for_edit(
 int BKE_sculpt_mask_layers_ensure(Object *ob, MultiresModifierData *mmd)
 {
   Mesh *me = static_cast<Mesh *>(ob->data);
-  const blender::Span<MPoly> polys = me->polygons();
-  const blender::Span<MLoop> loops = me->loops();
+  const Span<MPoly> polys = me->polygons();
+  const Span<MLoop> loops = me->loops();
   int ret = 0;
 
   const float *paint_mask = static_cast<const float *>(
@@ -2242,9 +2245,9 @@ static PBVH *build_pbvh_from_regular_mesh(Object *ob, Mesh *me_eval_deform, bool
   PBVH *pbvh = BKE_pbvh_new();
   BKE_pbvh_respect_hide_set(pbvh, respect_hide);
 
-  blender::MutableSpan<MVert> verts = me->vertices_for_write();
-  const blender::Span<MPoly> polys = me->polygons();
-  const blender::Span<MLoop> loops = me->loops();
+  MutableSpan<MVert> verts = me->vertices_for_write();
+  const Span<MPoly> polys = me->polygons();
+  const Span<MLoop> loops = me->loops();
 
   MLoopTri *looptri = static_cast<MLoopTri *>(
       MEM_malloc_arrayN(looptris_num, sizeof(*looptri), __func__));



More information about the Bf-blender-cvs mailing list