merge with 2.5 at r20783

1 files changed, 9 insertions, 6 deletions

diff --git a/source/blender/editors/physics/editparticle.c b/source/blender/editors/physics/editparticle.c
index 232082855cb..6d5b6768ceb 100644
--- a/source/blender/editors/physics/editparticle.c
+++ b/source/blender/editors/physics/editparticle.c
@@ -2455,13 +2455,16 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
 		new_pars= MEM_callocN(newtotpart*sizeof(ParticleData), "ParticleData new");
 		new_keys= MEM_callocN(newtotpart*sizeof(ParticleEditKey*), "ParticleEditKey new");
 
-		memcpy(new_pars, psys->particles, totpart*sizeof(ParticleData));
-		memcpy(new_keys, edit->keys, totpart*sizeof(ParticleEditKey*));
-
-		if(psys->particles) MEM_freeN(psys->particles);
+		if(psys->particles) {
+			memcpy(new_pars, psys->particles, totpart*sizeof(ParticleData));
+			MEM_freeN(psys->particles);
+		}
 		psys->particles= new_pars;
 
-		if(edit->keys) MEM_freeN(edit->keys);
+		if(edit->keys) {
+			memcpy(new_keys, edit->keys, totpart*sizeof(ParticleEditKey*));
+			MEM_freeN(edit->keys);
+		}
 		edit->keys= new_keys;
 
 		if(edit->mirror_cache) {
@@ -3759,7 +3762,7 @@ static int set_editable_exec(bContext *C, wmOperator *op)
 				PE_free_particle_edit(psys);
 
 			psys->flag &= ~PSYS_EDITED;
-			psys->recalc |= PSYS_RECALC_HAIR;
+			psys->recalc |= PSYS_RECALC_RESET;
 
 			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
 		}