merge with/from trunk at r35190

1 files changed, 30 insertions, 4 deletions

diff --git a/source/blender/editors/include/ED_util.h b/source/blender/editors/include/ED_util.h
index 96ad1989497..06c9c12444e 100644
--- a/source/blender/editors/include/ED_util.h
+++ b/source/blender/editors/include/ED_util.h
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -25,15 +25,23 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
+
+/** \file ED_util.h
+ *  \ingroup editors
+ */
+
 #ifndef ED_UTIL_H
 #define ED_UTIL_H
 
+struct Scene;
 struct Object;
 struct bContext;
 struct ARegion;
 struct uiBlock;
 struct wmOperator;
 struct wmOperatorType;
+struct EditMesh;
+struct Mesh;
 
 /* ed_util.c */
 
@@ -43,16 +51,24 @@ void	ED_editors_exit			(struct bContext *C);
 /* ************** Undo ************************ */
 
 /* undo.c */
-void	ED_undo_push			(struct bContext *C, char *str);
+void	ED_undo_push			(struct bContext *C, const char *str);
 void	ED_undo_push_op			(struct bContext *C, struct wmOperator *op);
 void	ED_undo_pop_op			(struct bContext *C, struct wmOperator *op);
 void	ED_undo_pop				(struct bContext *C);
 void	ED_undo_redo			(struct bContext *C);
 void	ED_OT_undo				(struct wmOperatorType *ot);
+void	ED_OT_undo_push			(struct wmOperatorType *ot);
 void	ED_OT_redo				(struct wmOperatorType *ot);
 
+int		ED_undo_operator_repeat(struct bContext *C, struct wmOperator *op);
+	/* convenience since UI callbacks use this mostly*/
+void	ED_undo_operator_repeat_cb(struct bContext *C, void *arg_op, void *arg_unused);
+void	ED_undo_operator_repeat_cb_evt(struct bContext *C, void *arg_op, int arg_unused);
+
+int		ED_undo_valid			(const struct bContext *C, const char *undoname);
+
 /* undo_editmode.c */
-void undo_editmode_push(struct bContext *C, char *name, 
+void undo_editmode_push(struct bContext *C, const char *name, 
 						void * (*getdata)(struct bContext *C),
 						void (*freedata)(void *), 
 						void (*to_editmode)(void *, void *, void *),  
@@ -66,11 +82,21 @@ void	undo_editmode_menu			(struct bContext *C);
 void	undo_editmode_clear			(void);
 void	undo_editmode_step			(struct bContext *C, int step);
 
+/* crazyspace.c */
+float *crazyspace_get_mapped_editverts(struct Scene *scene, struct Object *obedit);
+void crazyspace_set_quats_editmesh(struct BMEditMesh *em, float *origcos, float *mappedcos, float *quats);
+void crazyspace_set_quats_mesh(struct Mesh *me, float *origcos, float *mappedcos, float *quats);
+int sculpt_get_first_deform_matrices(struct Scene *scene, struct Object *ob, float (**deformmats)[3][3], float (**deformcos)[3]);
+void crazyspace_build_sculpt(struct Scene *scene, struct Object *ob, float (**deformmats)[3][3], float (**deformcos)[3]);
+
 
 /* ************** XXX OLD CRUFT WARNING ************* */
 
 void apply_keyb_grid(int shift, int ctrl, float *val, float fac1, float fac2, float fac3, int invert);
-int GetButStringLength(char *str);
+int GetButStringLength(const char *str);
+
+/* where else to go ? */
+void unpack_menu(struct bContext *C, const char *opname, const char *id_name, const char *abs_name, const char *folder, struct PackedFile *pf);
 
 #endif /* ED_UTIL_H */