Code cleanup: fixes for function prototypes
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 31 Mar 2014 11:34:57 +0000 (17:34 +0600)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 31 Mar 2014 11:35:56 +0000 (17:35 +0600)
intern/cycles/render/image.cpp
source/blender/blenkernel/intern/displist.c
source/blender/editors/sculpt_paint/paint_undo.c

index a0994708ce1b8c5d08b8515fbcda07723f383968..6348c9e6706ac3eb6de70e157351f45d425f58ad 100644 (file)
@@ -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 &&
index 4b251396376f83cabdd66af6f62d17d6e41a41f2..992e369a20f654a3e9864bedf9739b49d7329417 100644 (file)
@@ -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;
 
index cc97a2de6f45b11042b6fafdcd0c1ff21745a4bd..f3946e30b832754e33d1ba3c28b31eb82cea6f6a 100644 (file)
@@ -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)