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

[Bastien Montagne]

Commit: 04b8b1a167c332937a244fb88340d60fa9182efd
Author: Bastien Montagne
Date:   Tue Mar 20 11:33:59 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB04b8b1a167c332937a244fb88340d60fa9182efd

Merge branch 'master' into blender2.8

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

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



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

diff --cc source/blender/blenkernel/intern/library_query.c
index 27a2916ef92,d59658a2a07..bed2244702f
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@@ -672,7 -691,9 +672,10 @@@ void BKE_library_foreach_ID_link(Main *
  					library_foreach_ID_as_subdata_link((ID **)&material->nodetree, callback, user_data, flag, &data);
  				}
  				CALLBACK_INVOKE(material->group, IDWALK_CB_USER);
 +				CALLBACK_INVOKE(material->edit_image, IDWALK_CB_USER);
+ 				if (material->texpaintslot != NULL) {
+ 					CALLBACK_INVOKE(material->texpaintslot->ima, IDWALK_CB_NOP);
+ 				}
  				break;
  			}
  
diff --cc source/blender/blenkernel/intern/material.c
index a0059a99473,01f16625386..2971f56c775
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@@ -261,9 -256,11 +261,13 @@@ void BKE_material_copy_data(Main *bmain
  		ma_dst->preview = NULL;
  	}
  
+ 	if (ma_src->texpaintslot != NULL) {
+ 		ma_dst->texpaintslot = MEM_dupallocN(ma_src->texpaintslot);
+ 	}
+ 
  	BLI_listbase_clear(&ma_dst->gpumaterial);
 +
 +	/* TODO Duplicate Engine Settings and set runtime to NULL */
  }
  
  Material *BKE_material_copy(Main *bmain, const Material *ma)