Commit: e278c5879fba64310c0b38872cad76b27cc9ef9c
Author: Hans Goudey
Date: Tue Aug 2 22:24:38 2022 -0500
Branches: refactor-mesh-hide-generic
https://developer.blender.org/rBe278c5879fba64310c0b38872cad76b27cc9ef9c
Merge master
===================================================================
M source/blender/blenkernel/intern/pbvh.c
M source/blender/gpu/GPU_buffers.h
M source/blender/gpu/intern/gpu_buffers.c
===================================================================
diff --git a/source/blender/blenkernel/intern/pbvh.c
b/source/blender/blenkernel/intern/pbvh.c
index d3ba53fc310..ba859127240 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -1358,7 +1358,8 @@ static void pbvh_update_draw_buffer_cb(void *__restrict
userdata,
CustomData_get_layer(pbvh->pdata,
CD_SCULPT_FACE_SETS),
pbvh->face_sets_color_seed,
pbvh->face_sets_color_default,
- update_flags);
+ update_flags,
+ pbvh->vert_normals);
break;
}
case PBVH_BMESH:
diff --git a/source/blender/gpu/GPU_buffers.h b/source/blender/gpu/GPU_buffers.h
index 647917e21ca..6dc49ff494d 100644
--- a/source/blender/gpu/GPU_buffers.h
+++ b/source/blender/gpu/GPU_buffers.h
@@ -96,7 +96,8 @@ void GPU_pbvh_mesh_buffers_update(PBVHGPUFormat *vbo_id,
const int *sculpt_face_sets,
const int face_sets_color_seed,
const int face_sets_color_default,
- const int update_flags);
+ const int update_flags,
+ const float (*vert_normals)[3]);
bool GPU_pbvh_attribute_names_update(PBVHType pbvh_type,
PBVHGPUFormat *vbo_id,
diff --git a/source/blender/gpu/intern/gpu_buffers.c
b/source/blender/gpu/intern/gpu_buffers.c
index 0b954dbec5e..bfa30f74f11 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -227,7 +227,8 @@ void GPU_pbvh_mesh_buffers_update(PBVHGPUFormat *vbo_id,
const int *sculpt_face_sets,
int face_sets_color_seed,
int face_sets_color_default,
- int update_flags)
+ int update_flags,
+ const float (*vert_normals)[3])
{
GPUAttrRef vcol_refs[MAX_GPU_ATTR];
GPUAttrRef cd_uvs[MAX_GPU_ATTR];
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
