diff options
-rw-r--r-- | intern/cycles/render/image.cpp | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/displist.c | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_undo.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index a0994708ce1..6348c9e6706 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 4b251396376..992e369a20f 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 cc97a2de6f4..f3946e30b83 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) |