diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-05-22 23:49:02 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-05-22 23:49:02 +0300 |
commit | 44f91a9a18d6d942d958e7640f4d1c301d230150 (patch) | |
tree | e7e97a57a920f02e87b7539740590a5058f7614e /source/blender/blenlib | |
parent | 6cc293a6d97a2f8277660613a1ced9b2688bd7c0 (diff) | |
parent | 9b2923380092c7e3c771d354f8938c5ca20bfd9d (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenloader/intern/versioning_270.c
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/intern/listbase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/listbase.c b/source/blender/blenlib/intern/listbase.c index abc4a773328..0a6d575c7d6 100644 --- a/source/blender/blenlib/intern/listbase.c +++ b/source/blender/blenlib/intern/listbase.c @@ -692,7 +692,7 @@ void *BLI_rfindptr(const ListBase *listbase, const void *ptr, const int offset) } /** - * Returns the 1-based index of the first element of listbase which contains the specified + * Returns the 0-based index of the first element of listbase which contains the specified * null-terminated string at the specified offset, or -1 if not found. */ int BLI_findstringindex(const ListBase *listbase, const char *id, const int offset) |