[Bf-blender-cvs] [c0ea7275b45] refactor-mesh-position-generic: Merge branch 'refactor-mesh-selection-generic' into refactor-mesh-position-generic

Hans Goudey noreply at git.blender.org
Mon Sep 19 22:27:37 CEST 2022


Commit: c0ea7275b45f9bb0e76970e1f0ac348fd147778c
Author: Hans Goudey
Date:   Mon Sep 19 15:19:41 2022 -0500
Branches: refactor-mesh-position-generic
https://developer.blender.org/rBc0ea7275b45f9bb0e76970e1f0ac348fd147778c

Merge branch 'refactor-mesh-selection-generic' into refactor-mesh-position-generic

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



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

diff --cc source/blender/blenkernel/intern/paint.cc
index 59eac492db4,5dc8e3e0112..97b1b91e604
--- a/source/blender/blenkernel/intern/paint.cc
+++ b/source/blender/blenkernel/intern/paint.cc
@@@ -65,10 -66,19 +66,20 @@@
  
  #include "bmesh.h"
  
 +using blender::float3;
 +using blender::MutableSpan;
 +using blender::Span;
 +
+ static void sculpt_attribute_update_refs(Object *ob);
+ static SculptAttribute *sculpt_attribute_ensure_ex(Object *ob,
+                                                    eAttrDomain domain,
+                                                    eCustomDataType proptype,
+                                                    const char *name,
+                                                    const SculptAttributeParams *params,
+                                                    PBVHType pbvhtype,
+                                                    bool flat_array_for_bmesh);
+ void sculptsession_bmesh_add_layers(Object *ob);
+ 
 -using blender::MutableSpan;
 -using blender::Span;
 -
  static void palette_init_data(ID *id)
  {
    Palette *palette = (Palette *)id;
@@@ -2136,10 -2169,10 +2170,10 @@@ static PBVH *build_pbvh_from_regular_me
  {
    Mesh *me = BKE_object_get_original_mesh(ob);
    const int looptris_num = poly_to_tri_count(me->totpoly, me->totloop);
-   PBVH *pbvh = BKE_pbvh_new();
+   PBVH *pbvh = BKE_pbvh_new(PBVH_FACES);
    BKE_pbvh_respect_hide_set(pbvh, respect_hide);
  
 -  MutableSpan<MVert> verts = me->verts_for_write();
 +  MutableSpan<float3> positions = me->positions_for_write();
    const Span<MPoly> polys = me->polys();
    const Span<MLoop> loops = me->loops();



More information about the Bf-blender-cvs mailing list