From 5633bab2d0384fcfc6a96313811fd3d6c8736c10 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Tue, 6 Feb 2018 13:17:43 -0200 Subject: Fix crash when no active object To reproduce the crash: delete the active object of the scene. This bug was introduced on e9c40b7339be9. --- source/blender/editors/space_info/info_stats.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source') diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c index 4026ed8fcfe..25d590550ce 100644 --- a/source/blender/editors/space_info/info_stats.c +++ b/source/blender/editors/space_info/info_stats.c @@ -528,11 +528,12 @@ void ED_info_stats_clear(ViewLayer *view_layer) const char *ED_info_stats_string(Scene *scene, ViewLayer *view_layer) { - Object *ob = (view_layer->basact) ? view_layer->basact->object : NULL; + const eObjectMode object_mode = (view_layer->basact) ? view_layer->basact->object->mode : OB_MODE_OBJECT; + if (!view_layer->stats) { - stats_update(scene, view_layer, ob->mode); + stats_update(scene, view_layer, object_mode); } - stats_string(scene, view_layer, ob->mode); + stats_string(scene, view_layer, object_mode); return view_layer->stats->infostr; } -- cgit v1.2.3