[Bf-blender-cvs] [a5f53346a61] sculpt-dev: sculpt-dev: another windows compiler error

Joseph Eagar noreply at git.blender.org
Sat Oct 8 02:10:37 CEST 2022


Commit: a5f53346a614ecee74cc772da40aa572713ce2ad
Author: Joseph Eagar
Date:   Fri Oct 7 17:10:17 2022 -0700
Branches: sculpt-dev
https://developer.blender.org/rBa5f53346a614ecee74cc772da40aa572713ce2ad

sculpt-dev: another windows compiler error

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

M	source/blender/editors/sculpt_paint/sculpt_face_set.cc

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

diff --git a/source/blender/editors/sculpt_paint/sculpt_face_set.cc b/source/blender/editors/sculpt_paint/sculpt_face_set.cc
index cffff1f745d..a9af1d46a48 100644
--- a/source/blender/editors/sculpt_paint/sculpt_face_set.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_face_set.cc
@@ -434,16 +434,17 @@ ATTR_NO_OPT void do_draw_face_sets_brush_task_cb_ex(void *__restrict userdata,
             copy_v3_v3(fno, ss->vert_normals[ml->v]);
             float mask = ss->vmask ? ss->vmask[ml->v] : 0.0f;
 
-            const float fade2 = bstrength * SCULPT_brush_strength_factor(ss,
-                                                                         brush,
-                                                                         v->co,
-                                                                         sqrtf(test.dist),
-                                                                         ss->vert_normals[ml->v],
-                                                                         fno,
-                                                                         mask,
-                                                                         (PBVHVertRef){.i = ml->v},
-                                                                         thread_id,
-                                                                         &automask_data);
+            const float fade2 = bstrength *
+                                SCULPT_brush_strength_factor(ss,
+                                                             brush,
+                                                             v->co,
+                                                             sqrtf(test.dist),
+                                                             ss->vert_normals[ml->v],
+                                                             fno,
+                                                             mask,
+                                                             BKE_pbvh_make_vref((intptr_t)ml->v),
+                                                             thread_id,
+                                                             &automask_data);
 
             if (fade2 < test_limit) {
               ok = false;
@@ -527,7 +528,7 @@ ATTR_NO_OPT void do_draw_face_sets_brush_task_cb_ex(void *__restrict userdata,
                                                                l->v->no,
                                                                l->f->no,
                                                                mask,
-                                                               (PBVHVertRef){.i = (intptr_t)l->v},
+                                                               BKE_pbvh_make_vref((intptr_t)l->v),
                                                                thread_id,
                                                                &automask_data);



More information about the Bf-blender-cvs mailing list