Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Code cleanup: fixes for function prototypes

Browse Source
This commit is contained in:
Sergey Sharybin
2014-03-31 17:34:57 +06:00
parent ed775edeeb
commit a9b82244de
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/render/image.cpp
View File

@@ -145,7 +145,7 @@ bool ImageManager::is_float_image(const string& filename, void *builtin_data, bo
return is_float; 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 && return image->filename == filename &&
image->builtin_data == builtin_data && image->builtin_data == builtin_data &&

2
source/blender/blenkernel/intern/displist.c
View 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; ListBase *dispbase;

4
source/blender/editors/sculpt_paint/paint_undo.c
View 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) void ED_undo_paint_step_num(bContext *C, int type, int step)
{ {
if (type == UNDO_PAINT_IMAGE) if (type == UNDO_PAINT_IMAGE)
return undo_step_num(C, &ImageUndoStack, step); undo_step_num(C, &ImageUndoStack, step);
else if (type == UNDO_PAINT_MESH) 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) static char *undo_stack_get_name(UndoStack *stack, int nr, int *active)