diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-05-30 13:19:20 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-05-30 13:25:20 +0300 |
| commit | 48ceeead107e84631d89ea68efb7c04a61e3c19a (patch) | |
| tree | abefea9f9860a211b12dbec0292b305e7a38c879 /source/blender/draw/intern/draw_manager.h | |
| parent | 10c0bba28e0ddc65594bacf6baba8371abb33dbe (diff) | |
DRW: Instance Data: Replace with static allocation that can be referenced.
This mean you can store data used for drawing inside the object engine
data.
Also fixes T55243 Crash in ASAN debug builds due to use-after-free memory in draw code - instances issue?
Diffstat (limited to 'source/blender/draw/intern/draw_manager.h')
| -rw-r--r-- | source/blender/draw/intern/draw_manager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h index 77bb37b9c8a..9faab2cc2b0 100644 --- a/source/blender/draw/intern/draw_manager.h +++ b/source/blender/draw/intern/draw_manager.h @@ -295,7 +295,7 @@ typedef struct DRWManager { /* Cache generation */ ViewportMemoryPool *vmempool; DRWInstanceDataList *idatalist; - DRWInstanceData *common_instance_data[MAX_INSTANCE_DATA_SIZE]; + DRWInstanceData *object_instance_data[MAX_INSTANCE_DATA_SIZE]; /* State of the object being evaluated if already allocated. */ DRWCallState *ob_state; unsigned char state_cache_id; /* Could be larger but 254 view changes is already a lot! */ |