[Bf-blender-cvs] [400bade] gooseberry: Merge branch 'master' into gooseberry

[Sergey Sharybin]

Commit: 400bade66234ed950fe55d5ff9e7d2c22c2e66e3
Author: Sergey Sharybin
Date:   Wed Jan 14 12:58:30 2015 +0500
Branches: gooseberry
https://developer.blender.org/rB400bade66234ed950fe55d5ff9e7d2c22c2e66e3

Merge branch 'master' into gooseberry

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



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

diff --cc source/blender/makesrna/intern/rna_modifier.c
index 211bd19,3b9ff43..9125a85
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@@ -43,10 -43,9 +43,10 @@@
  #include "BLF_translation.h"
  
  #include "BKE_animsys.h"
- #include "BKE_object_data_transfer.h"
+ #include "BKE_data_transfer.h"
  #include "BKE_DerivedMesh.h"
  #include "BKE_dynamicpaint.h"
 +#include "BKE_effect.h"
  #include "BKE_mesh_mapping.h"
  #include "BKE_mesh_remap.h"
  #include "BKE_multires.h"