Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 1 Mar 2017 13:22:13 +0000 (00:22 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 1 Mar 2017 13:22:13 +0000 (00:22 +1100)
1  2 
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/render/CMakeLists.txt

index 794d8bf69510357d9d634cd0decd54a6849b71ab,bb75d65580243a3e02454a8e72ee9e24cf18be09..9eb3e673f278372bfee1e95355a995d65296096e
@@@ -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,
index 27fa119bc882c155d5e1b691a8a2859d2c6fc364,569b207c96669a76dc1950e1420d0441873d491e..024d8296b8f8cb48e32b5d402550969562e73957
@@@ -35,7 -35,7 +35,8 @@@ set(IN
        ../makesdna
        ../makesrna
        ../physics
 +      ../draw
+       ../../../intern/atomic
        ../../../intern/guardedalloc
        ../../../intern/mikktspace
        ../../../intern/smoke/extern