[Bf-blender-cvs] [3c0e15c] gooseberry: Merge branch 'alembic' into gooseberry

[Lukas Tönne]

Commit: 3c0e15c81aec6eb9dee91befde48d36d30edeacd
Author: Lukas Tönne
Date:   Tue Mar 31 17:49:54 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB3c0e15c81aec6eb9dee91befde48d36d30edeacd

Merge branch 'alembic' into gooseberry

Conflicts:
	source/blender/editors/space_view3d/view3d_intern.h
	source/blender/makesrna/intern/rna_modifier.c

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



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

diff --cc source/blender/makesrna/intern/rna_modifier.c
index f21f1c1,ce4058b..1201ec1
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@@ -1039,43 -1038,33 +1040,70 @@@ static EnumPropertyItem *rna_DataTransf
  	return item;
  }
  
+ static void rna_CorrectiveSmoothModifier_update(Main *bmain, Scene *scene, PointerRNA *ptr)
+ {
+ 	CorrectiveSmoothModifierData *csmd = (CorrectiveSmoothModifierData *)ptr->data;
+ 
+ 	MEM_SAFE_FREE(csmd->delta_cache);
+ 
+ 	rna_Modifier_update(bmain, scene, ptr);
+ }
+ 
+ static void rna_CorrectiveSmoothModifier_rest_source_update(Main *bmain, Scene *scene, PointerRNA *ptr)
+ {
+ 	CorrectiveSmoothModifierData *csmd = (CorrectiveSmoothModifierData *)ptr->data;
+ 
+ 	if (csmd->rest_source != MOD_CORRECTIVESMOOTH_RESTSOURCE_BIND) {
+ 		MEM_SAFE_FREE(csmd->bind_coords);
+ 		csmd->bind_coords_num = 0;
+ 	}
+ 
+ 	rna_CorrectiveSmoothModifier_update(bmain, scene, ptr);
+ }
+ 
+ static int rna_CorrectiveSmoothModifier_is_bind_get(PointerRNA *ptr)
+ {
+ 	CorrectiveSmoothModifierData *csmd = (CorrectiveSmoothModifierData *)ptr->data;
+ 	return (csmd->bind_coords != NULL);
+ }
+ 
 +static int rna_ParticleInstanceModifier_particle_system_poll(PointerRNA *ptr, const PointerRNA value)
 +{
 +	ParticleInstanceModifierData *psmd = ptr->data;
 +	ParticleSystem *psys = value.data;
 +	
 +	if (!psmd->ob)
 +		return false;
 +	
 +	/* make sure psys is in the object */
 +	return BLI_findindex(&psmd->ob->particlesystem, psys) >= 0;
 +}
 +
 +static PointerRNA rna_ParticleInstanceModifier_particle_system_get(PointerRNA *ptr)
 +{
 +	ParticleInstanceModifierData *psmd = ptr->data;
 +	ParticleSystem *psys;
 +	PointerRNA rptr;
 +	
 +	if (!psmd->ob)
 +		return PointerRNA_NULL;
 +	
 +	psys = BLI_findlink(&psmd->ob->particlesystem, psmd->psys - 1);
 +	RNA_pointer_create((ID *)psmd->ob, &RNA_ParticleSystem, psys, &rptr);
 +	return rptr;
 +}
 +
 +static void rna_ParticleInstanceModifier_particle_system_set(PointerRNA *ptr, const PointerRNA value)
 +{
 +	ParticleInstanceModifierData *psmd = ptr->data;
 +	
 +	if (!psmd->ob)
 +		return;
 +	
 +	psmd->psys = BLI_findindex(&psmd->ob->particlesystem, value.data) + 1;
 +	CLAMP_MIN(psmd->psys, 1);
 +}
 +
  #else
  
  static PropertyRNA *rna_def_property_subdivision_common(StructRNA *srna, const char type[])