diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-01-30 00:53:11 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-01-30 00:53:20 +0300 |
| commit | c7c8ee61686f22a11995f6fe6b10acf59db12b00 (patch) | |
| tree | c4a5faa0874118f69429973ad457531ad9590c5d /source/blender/draw/intern/draw_cache.c | |
| parent | 65761487229c61e5d043326cb5fd96cfca274e26 (diff) | |
Fix crash when adding modifiers to curve/surface/text objects
Diffstat (limited to 'source/blender/draw/intern/draw_cache.c')
| -rw-r--r-- | source/blender/draw/intern/draw_cache.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c index 083901c9ebe..d1823292585 100644 --- a/source/blender/draw/intern/draw_cache.c +++ b/source/blender/draw/intern/draw_cache.c @@ -826,11 +826,12 @@ GPUBatch *DRW_cache_object_surface_get(Object *ob) int DRW_cache_object_material_count_get(struct Object *ob) { + Mesh *me = (ob->runtime.mesh_eval != NULL) ? ob->runtime.mesh_eval : (Mesh *)ob->data; short type = (ob->runtime.mesh_eval != NULL) ? OB_MESH : ob->type; switch (type) { case OB_MESH: - return DRW_mesh_material_count_get(ob->data); + return DRW_mesh_material_count_get(me); case OB_CURVE: case OB_SURF: case OB_FONT: |