fix for r36399

- missing copy, free calls to curve falloff.
- missing localizing call for texture preview.
- also moved versioning into do_versions()

1 files changed, 14 insertions, 3 deletions

diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 5cba963b0a6..c518403d663 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -486,7 +486,10 @@ void free_texture(Tex *tex)
 	
 	if(tex->coba) MEM_freeN(tex->coba);
 	if(tex->env) BKE_free_envmap(tex->env);
-	if(tex->pd) BKE_free_pointdensity(tex->pd);
+	if(tex->pd) {
+		curvemapping_free(tex->pd->falloff_curve);
+		BKE_free_pointdensity(tex->pd);
+	}
 	if(tex->vd) BKE_free_voxeldata(tex->vd);
 	BKE_free_animdata((struct ID *)tex);
 	
@@ -762,9 +765,15 @@ Tex *copy_texture(Tex *tex)
 	
 	if(texn->coba) texn->coba= MEM_dupallocN(texn->coba);
 	if(texn->env) texn->env= BKE_copy_envmap(texn->env);
-	if(texn->pd) texn->pd= MEM_dupallocN(texn->pd);
+
+	if(texn->pd) {
+		texn->pd= MEM_dupallocN(texn->pd);
+		if(texn->pd->falloff_curve) {
+			texn->pd->falloff_curve = curvemapping_copy(texn->pd->falloff_curve);
+		}
+	}
+
 	if(texn->vd) texn->vd= MEM_dupallocN(texn->vd);
-	
 	if(tex->preview) texn->preview = BKE_previewimg_copy(tex->preview);
 
 	if(tex->nodetree) {
@@ -802,6 +811,8 @@ Tex *localize_texture(Tex *tex)
 			texn->pd->coba= MEM_dupallocN(texn->pd->coba);
 		}
 
+		texn->pd->falloff_curve= curvemapping_copy(texn->pd->falloff_curve);
+
 	}
 	if(texn->vd) {
 		texn->vd= MEM_dupallocN(texn->vd);