svn merge ^/trunk/blender -r41503:41575

3 files changed, 3 insertions, 3 deletions

diff --git a/source/blender/editors/util/editmode_undo.c b/source/blender/editors/util/editmode_undo.c
index 4aa7a657e95..4776cf0af53 100644
--- a/source/blender/editors/util/editmode_undo.c
+++ b/source/blender/editors/util/editmode_undo.c
@@ -338,7 +338,7 @@ int undo_editmode_valid(const char *undoname)
 
 /* get name of undo item, return null if no item with this index */
 /* if active pointer, set it to 1 if true */
-char *undo_editmode_get_name(bContext *C, int nr, int *active)
+const char *undo_editmode_get_name(bContext *C, int nr, int *active)
 {
 	UndoElem *uel;
 	
diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c
index 6a1819736a2..527537b5efb 100644
--- a/source/blender/editors/util/undo.c
+++ b/source/blender/editors/util/undo.c
@@ -426,7 +426,7 @@ static EnumPropertyItem *rna_undo_itemf(bContext *C, int undosys, int *totitem)
 	int active, i= 0;
 	
 	while(TRUE) {
-		char *name= NULL;
+		const char *name= NULL;
 		
 		if(undosys==UNDOSYSTEM_PARTICLE) {
 			name= PE_undo_get_name(CTX_data_scene(C), i, &active);
diff --git a/source/blender/editors/util/util_intern.h b/source/blender/editors/util/util_intern.h
index 3e2833ec89a..c6e2d079c28 100644
--- a/source/blender/editors/util/util_intern.h
+++ b/source/blender/editors/util/util_intern.h
@@ -37,7 +37,7 @@
 /* editmode_undo.c */
 void	undo_editmode_name			(struct bContext *C, const char *undoname);
 int		undo_editmode_valid			(const char *undoname);
-char	*undo_editmode_get_name		(struct bContext *C, int nr, int *active);
+const char *undo_editmode_get_name	(struct bContext *C, int nr, int *active);
 void	*undo_editmode_get_prev		(struct Object *ob);
 void	undo_editmode_step			(struct bContext *C, int step);
 void	undo_editmode_number		(struct bContext *C, int nr);