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

[Sergey Sharybin]

Commit: edad3076a91c72fb0bcaef651b9688d36999eec3
Author: Sergey Sharybin
Date:   Wed Jun 14 10:48:20 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBedad3076a91c72fb0bcaef651b9688d36999eec3

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/intern/library_remap.c
index be16e7ce448,668962cf6e4..a5e8e41e738
--- a/source/blender/blenkernel/intern/library_remap.c
+++ b/source/blender/blenkernel/intern/library_remap.c
@@@ -890,10 -838,34 +869,37 @@@ void BKE_libblock_free_datablock(ID *id
  		case ID_CF:
  			BKE_cachefile_free((CacheFile *)id);
  			break;
 +		case ID_WS:
 +			BKE_workspace_free((WorkSpace *)id);
 +			break;
  	}
+ }
+ 
+ /**
+  * used in headerbuttons.c image.c mesh.c screen.c sound.c and library.c
+  *
+  * \param do_id_user: if \a true, try to release other ID's 'references' hold by \a idv.
+  *                    (only applies to main database)
+  * \param do_ui_user: similar to do_id_user but makes sure UI does not hold references to
+  *                    \a id.
+  */
+ void BKE_libblock_free_ex(Main *bmain, void *idv, const bool do_id_user, const bool do_ui_user)
+ {
+ 	ID *id = idv;
+ 	short type = GS(id->name);
+ 	ListBase *lb = which_libbase(bmain, type);
+ 
 -	DAG_id_type_tag(bmain, type);
++	DEG_id_type_tag(bmain, type);
+ 
+ #ifdef WITH_PYTHON
+ 	BPY_id_release(id);
+ #endif
+ 
+ 	if (do_id_user) {
+ 		BKE_libblock_relink_ex(bmain, id, NULL, NULL, true);
+ 	}
+ 
+ 	BKE_libblock_free_datablock(id);
  
  	/* avoid notifying on removed data */
  	BKE_main_lock(bmain);