Fix T69363 EEVEE: Blender crash when using Edit mode for Ocean
Use same Mesh* as extraction. We always use the final mesh for shaded geom.
This commit is contained in:
parent
ed9f8bd956
commit
656228945e
Notes:
blender-bot
2023-02-14 08:38:11 +01:00
Referenced by issue #69363, Blender crash when using Edit mode for Ocean
|
@ -124,7 +124,8 @@ static DRW_MeshCDMask mesh_cd_calc_used_gpu_layers(const Mesh *me,
|
|||
struct GPUMaterial **gpumat_array,
|
||||
int gpumat_array_len)
|
||||
{
|
||||
const CustomData *cd_ldata = (me->edit_mesh) ? &me->edit_mesh->bm->ldata : &me->ldata;
|
||||
const Mesh *me_final = (me->edit_mesh) ? me->edit_mesh->mesh_eval_final : me;
|
||||
const CustomData *cd_ldata = &me_final->ldata;
|
||||
|
||||
/* See: DM_vertex_attributes_from_gpu for similar logic */
|
||||
DRW_MeshCDMask cd_used;
|
||||
|
@ -227,7 +228,8 @@ static void mesh_cd_extract_auto_layers_names_and_srgb(Mesh *me,
|
|||
int **r_auto_layers_srgb,
|
||||
int *r_auto_layers_len)
|
||||
{
|
||||
const CustomData *cd_ldata = (me->edit_mesh) ? &me->edit_mesh->bm->ldata : &me->ldata;
|
||||
const Mesh *me_final = (me->edit_mesh) ? me->edit_mesh->mesh_eval_final : me;
|
||||
const CustomData *cd_ldata = &me_final->ldata;
|
||||
|
||||
int uv_len_used = count_bits_i(cd_used.uv);
|
||||
int vcol_len_used = count_bits_i(cd_used.vcol);
|
||||
|
|
Loading…
Reference in New Issue