diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-04-18 14:18:49 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-04-18 14:18:49 +0300 |
| commit | 792f0aaad54631712de02df6b301e58ae3b59575 (patch) | |
| tree | 92fa5d6638072faa60da1b6490091f57abf81b12 /source/blender/makesrna/intern/rna_ID.c | |
| parent | bc6f68944885da097d20e94812bbac58ade5f985 (diff) | |
| parent | 8825a8e951c193ff855a1bbfb5a34ea93b8ccc55 (diff) | |
Merge branch 'master' into HMD_viewportHMD_viewport
Conflicts:
source/blender/editors/gpencil/gpencil_paint.c
Diffstat (limited to 'source/blender/makesrna/intern/rna_ID.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_ID.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 6ed2c55138c..a74758a4f71 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -342,7 +342,7 @@ static void rna_ID_user_clear(ID *id) static void rna_ID_user_remap(ID *id, Main *bmain, ID *new_id) { - if (GS(id->name) == GS(new_id->name)) { + if ((GS(id->name) == GS(new_id->name)) && (id != new_id)) { /* For now, do not allow remapping data in linked data from here... */ BKE_libblock_remap(bmain, id, new_id, ID_REMAP_SKIP_INDIRECT_USAGE | ID_REMAP_SKIP_NEVER_NULL_USAGE); } |