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

[Campbell Barton]

Commit: 48c58bd9138ad88d8aaa24ad9d6d67e1303e7905
Author: Campbell Barton
Date:   Tue Jun 21 12:14:49 2016 +1000
Branches: blender2.8
https://developer.blender.org/rB48c58bd9138ad88d8aaa24ad9d6d67e1303e7905

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/intern/dynamicpaint.c
index 7842d56,cc495b3..d02041d
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@@ -5177,11 -5499,20 +5177,8 @@@ static int dynamicPaint_doStep(Scene *s
  						dynamicPaint_updateBrushMaterials(brushObj, brush->mat, scene, &bMats);
  
  					/* Apply brush on the surface depending on it's collision type */
--					/* Particle brush: */
--					if (brush->collision == MOD_DPAINT_COL_PSYS) {
 -						if (brush->psys && brush->psys->part &&
 -						    ELEM(brush->psys->part->type, PART_EMITTER, PART_FLUID) &&
 -						    psys_check_enabled(brushObj, brush->psys))
 -						{
 -							/* Paint a particle system */
 -							BKE_animsys_evaluate_animdata(scene, &brush->psys->part->id, brush->psys->part->adt,
 -							                              BKE_scene_frame_get(scene), ADT_RECALC_ANIM);
 -							dynamicPaint_paintParticles(surface, brush->psys, brush, timescale);
 -						}
--					}
  					/* Object center distance: */
--					else if (brush->collision == MOD_DPAINT_COL_POINT && brushObj != ob) {
++					if (brush->collision == MOD_DPAINT_COL_POINT && brushObj != ob) {
  						dynamicPaint_paintSinglePoint(surface, brushObj->loc, brush, brushObj, &bMats, scene, timescale);
  					}
  					/* Mesh volume/proximity: */
diff --cc source/blender/blenkernel/intern/library_query.c
index 7d4520a,4fe408e..42cecfe
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@@ -321,20 -341,24 +332,20 @@@ void BKE_library_foreach_ID_link(ID *id
  
  				if (toolsett) {
  					CALLBACK_INVOKE(toolsett->skgen_template, IDWALK_NOP);
- 					CALLBACK_INVOKE(toolsett->imapaint.stencil, IDWALK_NOP);
- 					CALLBACK_INVOKE(toolsett->imapaint.clone, IDWALK_NOP);
- 					CALLBACK_INVOKE(toolsett->imapaint.canvas, IDWALK_NOP);
+ 
 -					CALLBACK_INVOKE(toolsett->particle.scene, IDWALK_NOP);
 -					CALLBACK_INVOKE(toolsett->particle.object, IDWALK_NOP);
 -					CALLBACK_INVOKE(toolsett->particle.shape_object, IDWALK_NOP);
 -
+ 					library_foreach_paint(&data, &toolsett->imapaint.paint);
+ 					CALLBACK_INVOKE(toolsett->imapaint.stencil, IDWALK_USER);
+ 					CALLBACK_INVOKE(toolsett->imapaint.clone, IDWALK_USER);
+ 					CALLBACK_INVOKE(toolsett->imapaint.canvas, IDWALK_USER);
+ 
  					if (toolsett->vpaint) {
- 						CALLBACK_INVOKE(toolsett->vpaint->paint.brush, IDWALK_NOP);
- 						CALLBACK_INVOKE(toolsett->vpaint->paint.palette, IDWALK_NOP);
+ 						library_foreach_paint(&data, &toolsett->vpaint->paint);
  					}
  					if (toolsett->wpaint) {
- 						CALLBACK_INVOKE(toolsett->wpaint->paint.brush, IDWALK_NOP);
- 						CALLBACK_INVOKE(toolsett->wpaint->paint.palette, IDWALK_NOP);
+ 						library_foreach_paint(&data, &toolsett->wpaint->paint);
  					}
  					if (toolsett->sculpt) {
- 						CALLBACK_INVOKE(toolsett->sculpt->paint.brush, IDWALK_NOP);
- 						CALLBACK_INVOKE(toolsett->sculpt->paint.palette, IDWALK_NOP);
+ 						library_foreach_paint(&data, &toolsett->sculpt->paint);
  						CALLBACK_INVOKE(toolsett->sculpt->gravity_object, IDWALK_NOP);
  					}
  					if (toolsett->uvsculpt) {