diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 18:41:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 18:42:52 +0300 |
| commit | 253dce07d7cccb769d34356fc34c5900f7cd0ec8 (patch) | |
| tree | e4018aaa2b89340d7d2e08cdbcba8ea3ff40b0cc /source/blender/blenkernel/intern/library.c | |
| parent | fe52a05e950e474036c80f554a4675f12203695b (diff) | |
| parent | 0cff044d84646c2890f13b8915eb708861bb36d6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/library.c')
| -rw-r--r-- | source/blender/blenkernel/intern/library.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 84aa75abc72..9486f068c44 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -289,7 +289,7 @@ static int id_expand_local_callback( return IDWALK_RET_NOP; } - /* Can hapen that we get unlinkable ID here, e.g. with shapekey referring to itself (through drivers)... + /* Can happen that we get unlinkable ID here, e.g. with shapekey referring to itself (through drivers)... * Just skip it, shape key can only be either indirectly linked, or fully local, period. * And let's curse one more time that stupid useless shapekey ID type! */ if (*id_pointer && *id_pointer != id_self && BKE_idcode_is_linkable(GS((*id_pointer)->name))) { |