[Bf-blender-cvs] [2658a3c] soc-2013-sketch_mesh: Merge branch 'master' into soc-2013-sketch_mesh

[Alexander Pinzon Fernandez]

Commit: 2658a3c1b44717f497f187a38000c804eb37bbba
Author: Alexander Pinzon Fernandez
Date:   Wed Dec 11 11:10:22 2013 -0500
http://developer.blender.org/rB2658a3c1b44717f497f187a38000c804eb37bbba

Merge branch 'master' into soc-2013-sketch_mesh

Conflicts:
	release/scripts/addons
	source/blender/blenloader/intern/readfile.c
	source/blender/blenloader/intern/writefile.c
	source/blender/editors/object/object_modifier.c
	source/blender/makesrna/intern/rna_modifier.c
	source/blender/modifiers/intern/MOD_laplaciandeform.c

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



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

diff --cc source/blender/makesdna/DNA_modifier_types.h
index 59ce965,92055fd..2f89a83
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@@ -1294,20 -1305,21 +1305,36 @@@ enum 
  	MOD_MESHCACHE_PLAY_EVAL = 1,
  };
  
 +typedef struct LaplacianDeformModifierData {
 +	ModifierData modifier;
 +	char anchor_grp_name[64]; /* MAX_VGROUP_NAME */
 +	int total_verts, repeat;
 +	float *vertexco;
 +	void *cacheSystem;
 +	short flag, pad[3];
 +	
 +} LaplacianDeformModifierData;
 +
 +/* Smooth modifier flags */
 +enum {
 +	MOD_LAPLACIANDEFORM_BIND = 1,
 +};
 +
  
+ typedef struct LaplacianDeformModifierData {
+ 	ModifierData modifier;
+ 	char anchor_grp_name[64];  /* MAX_VGROUP_NAME */
+ 	int total_verts, repeat;
+ 	float *vertexco;
+ 	void *cache_system;  /* runtime only */
+ 	short flag, pad[3];
+ 
+ } LaplacianDeformModifierData;
+ 
+ /* Smooth modifier flags */
+ enum {
+ 	MOD_LAPLACIANDEFORM_BIND = 1,
+ };
+ 
+ 
  #endif  /* __DNA_MODIFIER_TYPES_H__ */
diff --cc source/blender/makesrna/RNA_access.h
index 1485985,f7909d2..4782451
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@@ -296,8 -296,8 +296,9 @@@ extern StructRNA RNA_KinematicConstrain
  extern StructRNA RNA_Lamp;
  extern StructRNA RNA_LampSkySettings;
  extern StructRNA RNA_LampTextureSlot;
+ extern StructRNA RNA_LaplacianDeformModifier;
  extern StructRNA RNA_LaplacianSmoothModifier;
 +extern StructRNA RNA_LaplacianDeformModifier;
  extern StructRNA RNA_Lattice;
  extern StructRNA RNA_LatticeModifier;
  extern StructRNA RNA_LatticePoint;