diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-07-15 20:24:32 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-07-15 20:27:54 +0300 |
| commit | 4404a0dcd4c593d199786d01a092105267243235 (patch) | |
| tree | 84aca65a37139030a89f7f406680f57dd4522ce9 /source/blender/draw/intern/draw_instance_data.c | |
| parent | 0b255661435ab7021db3acafe15abe6ea0b946b5 (diff) | |
Fix T66707 Modifying bone's 'Custom Object' reference shape causes blender to crash
This was caused by an instancing batch not being initialized correctly.
Diffstat (limited to 'source/blender/draw/intern/draw_instance_data.c')
| -rw-r--r-- | source/blender/draw/intern/draw_instance_data.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/draw/intern/draw_instance_data.c b/source/blender/draw/intern/draw_instance_data.c index 3e5dfb53fc7..802f49d6549 100644 --- a/source/blender/draw/intern/draw_instance_data.c +++ b/source/blender/draw/intern/draw_instance_data.c @@ -141,7 +141,8 @@ GPUBatch *DRW_temp_batch_instance_request(DRWInstanceDataList *idatalist, GPUBatch *batch = BLI_memblock_alloc(idatalist->pool_instancing); bool is_compatible = (batch->gl_prim_type == geom->gl_prim_type) && (batch->inst == buf) && - (buf->vbo_id != 0) && (batch->phase == GPU_BATCH_READY_TO_DRAW); + (buf->vbo_id != 0) && (batch->phase == GPU_BATCH_READY_TO_DRAW) && + (batch->elem == geom->elem); for (int i = 0; i < GPU_BATCH_VBO_MAX_LEN && is_compatible; i++) { if (batch->verts[i] != geom->verts[i]) { is_compatible = false; |