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

[Campbell Barton]

Commit: 8901263b5f04152a9c6a897c5115acd51be11bf1
Author: Campbell Barton
Date:   Thu Mar 2 00:22:13 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB8901263b5f04152a9c6a897c5115acd51be11bf1

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/modifiers/intern/MOD_dynamicpaint.c
index 794d8bf695,bb75d65580..9eb3e673f2
--- a/source/blender/modifiers/intern/MOD_dynamicpaint.c
+++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c
@@@ -116,9 -116,37 +116,9 @@@ static DerivedMesh *applyModifier(Modif
  
  static bool is_brush_cb(Object *UNUSED(ob), ModifierData *pmd)
  {
- 	return ((DynamicPaintModifierData*)pmd)->brush != NULL;
+ 	return ((DynamicPaintModifierData *)pmd)->brush != NULL;
  }
  
 -static void updateDepgraph(ModifierData *md, DagForest *forest,
 -                           struct Main *UNUSED(bmain),
 -                           struct Scene *scene,
 -                           Object *ob,
 -                           DagNode *obNode)
 -{
 -	DynamicPaintModifierData *pmd = (DynamicPaintModifierData *) md;
 -
 -	/* add relation from canvases to all brush objects */
 -	if (pmd && pmd->canvas) {
 -#ifdef WITH_LEGACY_DEPSGRAPH
 -		for (DynamicPaintSurface *surface = pmd->canvas->surfaces.first; surface; surface = surface->next) {
 -			if (surface->effect & MOD_DPAINT_EFFECT_DO_DRIP) {
 -				dag_add_forcefield_relations(forest, scene, ob, obNode, surface->effector_weights, true, 0, "Dynamic Paint Field");
 -			}
 -
 -			/* Actual code uses custom loop over group/scene without layer checks in dynamicPaint_doStep */
 -			dag_add_collision_relations(forest, scene, ob, obNode, surface->brush_group, -1, eModifierType_DynamicPaint, is_brush_cb, false, "Dynamic Paint Brush");
 -		}
 -#else
 -	(void)forest;
 -	(void)scene;
 -	(void)ob;
 -	(void)obNode;
 -#endif
 -	}
 -}
 -
  static void updateDepsgraph(ModifierData *md,
                              struct Main *UNUSED(bmain),
                              struct Scene *scene,
diff --cc source/blender/render/CMakeLists.txt
index 27fa119bc8,569b207c96..024d8296b8
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@@ -35,7 -35,7 +35,8 @@@ set(IN
  	../makesdna
  	../makesrna
  	../physics
 +	../draw
+ 	../../../intern/atomic
  	../../../intern/guardedalloc
  	../../../intern/mikktspace
  	../../../intern/smoke/extern