archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Eevee: Keep track on whether orco was allocated or not

Browse Source 
If it's coming from vertex data, we must not free that pointer.
This commit is contained in:
Sergey Sharybin
2018-05-30 12:40:16 +02:00
parent f03953ae06
commit da16cb1511
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/draw/intern/draw_cache_impl_mesh.c
View File

@@ -139,6 +139,7 @@ typedef struct MeshRenderData {
MLoop *mloop; MLoop *mloop;
MPoly *mpoly; MPoly *mpoly;
float (*orco)[3]; /* vertex coordinates normalized to bounding box */ float (*orco)[3]; /* vertex coordinates normalized to bounding box */
bool is_orco_allocated;
MDeformVert *dvert; MDeformVert *dvert;
MLoopUV *mloopuv; MLoopUV *mloopuv;
MLoopCol *mloopcol; MLoopCol *mloopcol;
@@ -564,10 +565,12 @@ static MeshRenderData *mesh_render_data_create_ex(
#undef CD_VALIDATE_ACTIVE_LAYER #undef CD_VALIDATE_ACTIVE_LAYER
rdata->is_orco_allocated = false;
if (cd_vused[CD_ORCO] & 1) { if (cd_vused[CD_ORCO] & 1) {
rdata->orco = CustomData_get_layer(cd_vdata, CD_ORCO); rdata->orco = CustomData_get_layer(cd_vdata, CD_ORCO);
/* If orco is not available compute it ourselves */ /* If orco is not available compute it ourselves */
if (!rdata->orco) { if (!rdata->orco) {
rdata->is_orco_allocated = true;
if (me->edit_btmesh) { if (me->edit_btmesh) {
BMesh *bm = me->edit_btmesh->bm; BMesh *bm = me->edit_btmesh->bm;
rdata->orco = MEM_mallocN(sizeof(*rdata->orco) * rdata->vert_len, "orco mesh"); rdata->orco = MEM_mallocN(sizeof(*rdata->orco) * rdata->vert_len, "orco mesh");
@@ -814,7 +817,9 @@ static MeshRenderData *mesh_render_data_create_ex(
static void mesh_render_data_free(MeshRenderData *rdata) static void mesh_render_data_free(MeshRenderData *rdata)
{ {
if (rdata->is_orco_allocated) {
MEM_SAFE_FREE(rdata->orco); MEM_SAFE_FREE(rdata->orco);
}
MEM_SAFE_FREE(rdata->cd.offset.uv); MEM_SAFE_FREE(rdata->cd.offset.uv);
MEM_SAFE_FREE(rdata->cd.offset.vcol); MEM_SAFE_FREE(rdata->cd.offset.vcol);
MEM_SAFE_FREE(rdata->cd.uuid.auto_mix); MEM_SAFE_FREE(rdata->cd.uuid.auto_mix);