diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2022-01-29 23:54:21 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2022-01-29 23:54:21 +0300 |
| commit | e0c35f0ac03d79cc19c1166138516888748c8253 (patch) | |
| tree | 5904d4c735bdf95de2a60577f62a4501d259d141 /source/blender/draw/intern/draw_cache_impl_mesh.c | |
| parent | 43bca12ec43fcc042176c4bec8ddb1f5c6383c28 (diff) | |
Fix merge bugs
Diffstat (limited to 'source/blender/draw/intern/draw_cache_impl_mesh.c')
| -rw-r--r-- | source/blender/draw/intern/draw_cache_impl_mesh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index bd5db7719f8..7ed18a8968d 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -1248,11 +1248,11 @@ static void sculpt_request_active_vcol(MeshBatchCache *cache, Object *object, Me DRW_MeshAttributes attrs_needed; drw_mesh_attributes_clear(&attrs_needed); - const Mesh *me_final = editmesh_final_or_this(me); + const Mesh *me_final = editmesh_final_or_this(object, me); const CustomData *cd_vdata = mesh_cd_vdata_get_from_mesh(me_final); const CustomData *cd_ldata = mesh_cd_ldata_get_from_mesh(me_final); - if (mesh_cd_calc_active_vcol_layer(me, &attrs_needed)) { + if (mesh_cd_calc_active_vcol_layer(object, me, &attrs_needed)) { int active = mesh_cd_get_active_color_i(me_final, cd_vdata, cd_ldata); int render = mesh_cd_get_render_color_i(me_final, cd_vdata, cd_ldata); |