Undo revision 23130 which was a merge with 2.5, a messy one because I did something wrong (`svn status` output: http://www.pasteall.org/7887).soc-2009-kazanbas

The command: svn merge -r 23130:23129 https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-kazanbas

1 files changed, 6 insertions, 5 deletions

diff --git a/source/blender/editors/include/ED_particle.h b/source/blender/editors/include/ED_particle.h
index 28807caa255..43cb5053f48 100644
--- a/source/blender/editors/include/ED_particle.h
+++ b/source/blender/editors/include/ED_particle.h
@@ -37,19 +37,20 @@ struct ParticleSystem;
 struct RadialControl;
 struct rcti;
 struct wmWindowManager;
-struct PTCacheEdit;
 
 /* particle edit mode */
-void PE_free_ptcache_edit(struct PTCacheEdit *edit);
-int PE_start_edit(struct PTCacheEdit *edit);
+void PE_change_act(void *ob_v, void *act_v);
+void PE_change_act_psys(struct Scene *scene, struct Object *ob, struct ParticleSystem *psys);
+int PE_can_edit(struct ParticleSystem *psys);
 
 /* access */
-struct PTCacheEdit *PE_get_current(struct Scene *scene, struct Object *ob);
+struct ParticleSystem *PE_get_current(struct Scene *scene, struct Object *ob);
+short PE_get_current_num(struct Object *ob);
 int PE_minmax(struct Scene *scene, float *min, float *max);
 struct ParticleEditSettings *PE_settings(Scene *scene);
 
 /* update calls */
-void PE_hide_keys_time(struct Scene *scene, struct PTCacheEdit *edit, float cfra);
+void PE_hide_keys_time(struct Scene *scene, struct ParticleSystem *psys, float cfra);
 void PE_update_object(struct Scene *scene, struct Object *ob, int useflag);
 
 /* selection tools */