blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Fix T66707 Modifying bone's 'Custom Object' reference shape causes blender to crash 

This was caused by an instancing batch not being initialized correctly.
This commit is contained in:
Clément Foucault 2019-07-15 19:24:32 +02:00
parent 0b25566143
commit 4404a0dcd4
Notes: blender-bot 2023-02-14 05:41:57 +01:00 
Referenced by issue #66707, Modifying bone's 'Custom Object' reference shape causes blender to crash
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/draw/intern/draw_instance_data.c
View File

@ -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;