From c7c8ee61686f22a11995f6fe6b10acf59db12b00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Wed, 29 Jan 2020 22:53:11 +0100 Subject: Fix crash when adding modifiers to curve/surface/text objects --- source/blender/draw/intern/draw_cache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source') 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: -- cgit v1.2.3