[Bf-blender-cvs] [a9b8224] master: Code cleanup: fixes for function prototypes

[Sergey Sharybin]

Commit: a9b82244de30cd90cc27c000e0d84d9144c8c1ab
Author: Sergey Sharybin
Date:   Mon Mar 31 17:34:57 2014 +0600
https://developer.blender.org/rBa9b82244de30cd90cc27c000e0d84d9144c8c1ab

Code cleanup: fixes for function prototypes

===================================================================

M	intern/cycles/render/image.cpp
M	source/blender/blenkernel/intern/displist.c
M	source/blender/editors/sculpt_paint/paint_undo.c

===================================================================

diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index a099470..6348c9e 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -145,7 +145,7 @@ bool ImageManager::is_float_image(const string& filename, void *builtin_data, bo
 	return is_float;
 }
 
-static bool image_equals(ImageManager::Image *image, const string& filename, void *builtin_data, bool interpolation)
+static bool image_equals(ImageManager::Image *image, const string& filename, void *builtin_data, InterpolationType interpolation)
 {
 	return image->filename == filename &&
 	       image->builtin_data == builtin_data &&
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index 4b25139..992e369 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -1726,7 +1726,7 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba
 	}
 }
 
-void BKE_displist_make_curveTypes(Scene *scene, Object *ob, bool for_orco)
+void BKE_displist_make_curveTypes(Scene *scene, Object *ob, const bool for_orco)
 {
 	ListBase *dispbase;
 
diff --git a/source/blender/editors/sculpt_paint/paint_undo.c b/source/blender/editors/sculpt_paint/paint_undo.c
index cc97a2d..f3946e3 100644
--- a/source/blender/editors/sculpt_paint/paint_undo.c
+++ b/source/blender/editors/sculpt_paint/paint_undo.c
@@ -294,9 +294,9 @@ static void undo_step_num(bContext *C, UndoStack *stack, int step)
 void ED_undo_paint_step_num(bContext *C, int type, int step)
 {
 	if (type == UNDO_PAINT_IMAGE)
-		return undo_step_num(C, &ImageUndoStack, step);
+		undo_step_num(C, &ImageUndoStack, step);
 	else if (type == UNDO_PAINT_MESH)
-		return undo_step_num(C, &MeshUndoStack, step);
+		undo_step_num(C, &MeshUndoStack, step);
 }
 
 static char *undo_stack_get_name(UndoStack *stack, int nr, int *active)