Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Eagar <joeedh@gmail.com>2022-10-08 03:10:17 +0300
committerJoseph Eagar <joeedh@gmail.com>2022-10-08 03:10:17 +0300
commita5f53346a614ecee74cc772da40aa572713ce2ad (patch)
tree490ee6e9fd8317cd7fb0654c98c74848b657a2ec
parent6c2d0354e725225bd3a4c4a7e86479c18d08c8ef (diff)
sculpt-dev: another windows compiler error
-rw-r--r--source/blender/editors/sculpt_paint/sculpt_face_set.cc23
1 files changed, 12 insertions, 11 deletions
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);