[Bf-blender-cvs] [ec88e39] depsgraph_refactor: Merge branch 'master' into depsgraph_refactor

[Sergey Sharybin]

Commit: ec88e3928aa929d8cac598682ad019eef29b27a6
Author: Sergey Sharybin
Date:   Wed Feb 11 14:04:27 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rBec88e3928aa929d8cac598682ad019eef29b27a6

Merge branch 'master' into depsgraph_refactor

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



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

diff --cc source/blender/modifiers/intern/MOD_mask.c
index ff86568,59348c5..db84fdd
--- a/source/blender/modifiers/intern/MOD_mask.c
+++ b/source/blender/modifiers/intern/MOD_mask.c
@@@ -50,8 -50,9 +50,10 @@@
  #include "BKE_deform.h"
  
  #include "depsgraph_private.h"
 +#include "DEG_depsgraph_build.h"
  
+ #include "BLI_strict_flags.h"
+ 
  static void copyData(ModifierData *md, ModifierData *target)
  {
  #if 0