[Bf-blender-cvs] [c7c8ee61686] blender-v2.82-release: Fix crash when adding modifiers to curve/surface/text objects
Clément Foucault
noreply at git.blender.org
Wed Jan 29 22:53:31 CET 2020
Commit: c7c8ee61686f22a11995f6fe6b10acf59db12b00
Author: Clément Foucault
Date: Wed Jan 29 22:53:11 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rBc7c8ee61686f22a11995f6fe6b10acf59db12b00
Fix crash when adding modifiers to curve/surface/text objects
===================================================================
M source/blender/draw/intern/draw_cache.c
===================================================================
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:
More information about the Bf-blender-cvs
mailing list