diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-05-12 09:49:31 +0400 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-05-12 09:49:31 +0400 |
| commit | 3d7d930e31992364caf586d89d4256af1b479dbb (patch) | |
| tree | 4e106cc8d418bffa41109c23d27fd20e99e18dd6 | |
| parent | e2672a433b744e53b52763523929c50364c10828 (diff) | |
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
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |