[Bf-blender-cvs] [fd4d7fbf131] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: fd4d7fbf131a02862b93915d65559d66177a6f18
Author: Bastien Montagne
Date:   Thu Jan 25 10:15:31 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBfd4d7fbf131a02862b93915d65559d66177a6f18

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/intern/library_remap.c

===================================================================



===================================================================

diff --cc source/blender/blenkernel/intern/library_remap.c
index fb672cb8b9f,31dc46a55f0..6d4c4082810
--- a/source/blender/blenkernel/intern/library_remap.c
+++ b/source/blender/blenkernel/intern/library_remap.c
@@@ -205,11 -194,12 +205,13 @@@ static int foreach_libblock_remap_callb
  			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))
 +		    (skip_indirect && is_indirect) ||
 +		    (is_reference && skip_reference))
  		{
  			if (is_indirect) {
  				id_remap_data->skipped_indirect++;