From 3d7d930e31992364caf586d89d4256af1b479dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20T=C3=B6nne?= Date: Mon, 12 May 2014 07:49:31 +0200 Subject: Fix for crash when doing "make local object+data" on an empty. This commit added object data loop, without checking ob->data for NULL: rB6e5e3b73f37f952420d87a3d8acd07a7f68dd5a3 --- source/blender/editors/object/object_relations.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index fc5f32b013d..6ff21f75733 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -2117,7 +2117,7 @@ static void tag_localizable_objects(bContext *C, int mode) /* If data is also gonna to become local, mark data we're interested in * as gonna-to-be-local. */ - if (mode == MAKE_LOCAL_SELECT_OBDATA) { + if (mode == MAKE_LOCAL_SELECT_OBDATA && object->data) { ID *data_id = (ID *) object->data; data_id->flag |= LIB_DOIT; } -- cgit v1.2.3