diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-23 04:23:11 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-23 04:23:11 +0400 |
| commit | 40449b1994301081f96d014df626a5375e020c76 (patch) | |
| tree | 20220d8b071310fda8a0ab851c7a8f7bcc3ed8a2 /source/blender/blenkernel/intern/library.c | |
| parent | fa0211df269a3398dd70467982f9e129c79e501b (diff) | |
| parent | 3ca00cbf541d0283e91dc454866a5f24576271be (diff) | |
Merged changes in the trunk up to revision 53280.
Diffstat (limited to 'source/blender/blenkernel/intern/library.c')
| -rw-r--r-- | source/blender/blenkernel/intern/library.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 2192d2862c8..98625807ddc 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -158,8 +158,10 @@ void id_lib_extern(ID *id) /* ensure we have a real user */ void id_us_ensure_real(ID *id) { - if (ID_REAL_USERS(id) <= 0) { - id->us = MAX2(id->us, 0) + 1; + if (id) { + if (ID_REAL_USERS(id) <= 0) { + id->us = MAX2(id->us, 0) + 1; + } } } |