diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-25 12:15:31 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-25 12:15:31 +0300 |
| commit | fd4d7fbf131a02862b93915d65559d66177a6f18 (patch) | |
| tree | 5b0f8d30f77e875da5c3ad508a36c02a37e4a2c1 /source/blender | |
| parent | 38dafd5f44a07b4937ca53cf67cce4093d5797f7 (diff) | |
| parent | 566eb60d817da3e32661efda59b20f6f893ff7cc (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/library_remap.c
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/library_remap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c index fb672cb8b9f..6d4c4082810 100644 --- a/source/blender/blenkernel/intern/library_remap.c +++ b/source/blender/blenkernel/intern/library_remap.c @@ -205,9 +205,11 @@ static int foreach_libblock_remap_callback(void *user_data, ID *id_self, ID **id id->tag |= LIB_TAG_DOIT; } - /* Special hack in case it's Object->data and we are in edit mode (skipped_direct too). */ + /* Special hack in case it's Object->data and we are in edit mode, and new_id is not NULL + * (otherwise, we follow common NEVER_NULL flags). + * (skipped_indirect too). */ if ((is_never_null && skip_never_null) || - (is_obj_editmode && (((Object *)id)->data == *id_p)) || + (is_obj_editmode && (((Object *)id)->data == *id_p) && new_id != NULL) || (skip_indirect && is_indirect) || (is_reference && skip_reference)) { |