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

[Lukas Tönne]

Commit: 82a756114e27888eb45015006681a4efd7291b4c
Author: Lukas Tönne
Date:   Mon May 19 10:37:53 2014 +0200
https://developer.blender.org/rB82a756114e27888eb45015006681a4efd7291b4c

Merge branch 'master' into depsgraph_refactor

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



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

diff --cc source/blender/makesrna/intern/rna_scene.c
index 1f04510,82dae1d..eceaa72
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -359,11 -357,8 +360,12 @@@ EnumPropertyItem bake_save_mode_items[
  #include "BKE_screen.h"
  #include "BKE_sequencer.h"
  #include "BKE_animsys.h"
+ #include "BKE_freestyle.h"
  
 +#include "DEG_depsgraph.h"
 +#include "DEG_depsgraph_build.h"
 +#include "DEG_depsgraph_debug.h"
 +
  #include "WM_api.h"
  
  #include "ED_info.h"