[Bf-blender-cvs] [7bb5380] gooseberry: Merge branch 'master' into gooseberry

[Bastien Montagne]

Commit: 7bb53800ba162dbb8c2c103a4232468f84ae6f0b
Author: Bastien Montagne
Date:   Sat Jan 10 10:26:11 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB7bb53800ba162dbb8c2c103a4232468f84ae6f0b

Merge branch 'master' into gooseberry

Conflicts:
	source/blender/editors/object/object_intern.h
	source/blender/editors/object/object_ops.c
	source/blender/makesrna/intern/rna_modifier.c

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



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

diff --cc source/blender/editors/object/object_intern.h
index 5949588,207afdf..3d4ac73
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@@ -275,8 -277,9 +286,12 @@@ void OBJECT_OT_lod_remove(struct wmOper
  /* object_random.c */
  void OBJECT_OT_vertex_random(struct wmOperatorType *ot);
  
+ /* object_transfer_data.c */
+ void OBJECT_OT_data_transfer(struct wmOperatorType *ot);
+ void OBJECT_OT_datalayout_transfer(struct wmOperatorType *ot);
+ 
 +/* object_lamp.c */
 +void LAMP_OT_lamp_position(struct wmOperatorType *ot);
 +
  #endif /* __OBJECT_INTERN_H__ */
  
diff --cc source/blender/editors/object/object_ops.c
index 2e479f4,5189594..2a2f19e
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@@ -258,7 -250,8 +258,10 @@@ void ED_operatortypes_object(void
  
  	WM_operatortype_append(OBJECT_OT_vertex_random);
  
+ 	WM_operatortype_append(OBJECT_OT_data_transfer);
+ 	WM_operatortype_append(OBJECT_OT_datalayout_transfer);
++
 +	WM_operatortype_append(LAMP_OT_lamp_position);
  }
  
  void ED_operatormacros_object(void)
diff --cc source/blender/makesrna/intern/rna_modifier.c
index 3ccf098,9780c45..211bd19
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@@ -43,8 -43,11 +43,12 @@@
  #include "BLF_translation.h"
  
  #include "BKE_animsys.h"
+ #include "BKE_object_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"
  #include "BKE_smoke.h" /* For smokeModifier_free & smokeModifier_createType */