diff options
| -rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 7 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_listbase.h | 4 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/listbase.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_info/space_info.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_intern.h | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 |
6 files changed, 7 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 25b70ce1793..5918879906a 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -623,12 +623,7 @@ int modifiers_isPreview(Object *ob) int modifiers_indexInObject(Object *ob, ModifierData *md_seek) { - int i = 0; - ModifierData *md; - - for (md = ob->modifiers.first; (md && md_seek != md); md = md->next, i++) ; - if (!md) return -1; /* modifier isn't in the object */ - return i; + return BLI_findindex(&ob->modifiers, md_seek); } void modifier_freeTemporaryData(ModifierData *md) diff --git a/source/blender/blenlib/BLI_listbase.h b/source/blender/blenlib/BLI_listbase.h index 1330a74bea3..d06956e39de 100644 --- a/source/blender/blenlib/BLI_listbase.h +++ b/source/blender/blenlib/BLI_listbase.h @@ -41,7 +41,7 @@ extern "C" { #endif void BLI_insertlink(struct ListBase *listbase, void *vprevlink, void *vnewlink); -int BLI_findindex(const struct ListBase *listbase, void *vlink); +int BLI_findindex(const struct ListBase *listbase, const void *vlink); int BLI_findstringindex(const struct ListBase *listbase, const char *id, const int offset); /* find forwards */ @@ -79,4 +79,4 @@ struct LinkData *BLI_genericNodeN(void *data); } #endif -#endif +#endif /* __BLI_LISTBASE_H__ */ diff --git a/source/blender/blenlib/intern/listbase.c b/source/blender/blenlib/intern/listbase.c index 9f6f409c473..c60a9ae6bfc 100644 --- a/source/blender/blenlib/intern/listbase.c +++ b/source/blender/blenlib/intern/listbase.c @@ -345,7 +345,7 @@ void *BLI_rfindlink(const ListBase *listbase, int number) return link; } -int BLI_findindex(const ListBase *listbase, void *vlink) +int BLI_findindex(const ListBase *listbase, const void *vlink) { Link *link = NULL; int number = 0; diff --git a/source/blender/editors/space_info/space_info.c b/source/blender/editors/space_info/space_info.c index cba0a808d63..db9be22eedb 100644 --- a/source/blender/editors/space_info/space_info.c +++ b/source/blender/editors/space_info/space_info.c @@ -272,7 +272,7 @@ static void info_header_listener(ARegion *ar, wmNotifier *wmn) static void recent_files_menu_draw(const bContext *UNUSED(C), Menu *menu) { struct RecentFile *recent; - char file [FILE_MAX]; + char file[FILE_MAX]; uiLayout *layout = menu->layout; uiLayoutSetOperatorContext(layout, WM_OP_EXEC_REGION_WIN); if (G.recent_files.first) { diff --git a/source/blender/editors/uvedit/uvedit_intern.h b/source/blender/editors/uvedit/uvedit_intern.h index b42875f20c2..27bbba11e75 100644 --- a/source/blender/editors/uvedit/uvedit_intern.h +++ b/source/blender/editors/uvedit/uvedit_intern.h @@ -51,7 +51,7 @@ int uvedit_face_visible_nolocal(struct Scene *scene, struct BMFace *efa); /* geometric utilities */ float uv_poly_area(float uv[][2], int len); -void uv_poly_copy_aspect(float uv_orig [][2], float uv[][2], float aspx, float aspy, int len); +void uv_poly_copy_aspect(float uv_orig[][2], float uv[][2], float aspx, float aspy, int len); void uv_poly_center(struct BMEditMesh *em, struct BMFace *f, float r_cent[2]); /* find nearest */ diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index bb957cfcb3c..469845ec2bc 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1430,7 +1430,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar int i; MenuType *mt = WM_menutype_find("USERPREF_MT_splash", TRUE); char url[96]; - char file [FILE_MAX]; + char file[FILE_MAX]; #ifndef WITH_HEADLESS extern char datatoc_splash_png[]; |