diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-26 19:43:02 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-26 19:43:02 +0300 |
| commit | f202dab0f2eaf4e387f16516894db74c0e7e29a0 (patch) | |
| tree | 074f8a42f787319c5b17723309467ff24e9bf626 /source/blender/blenkernel/intern/context.c | |
| parent | f71847159db13099d0d281f2a8c91295b71f35f3 (diff) | |
| parent | b94efe0e8b785598933d9f506b965068652fb579 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/makesdna/DNA_customdata_types.h
Diffstat (limited to 'source/blender/blenkernel/intern/context.c')
| -rw-r--r-- | source/blender/blenkernel/intern/context.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index a958db1e327..59f7da83925 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -456,7 +456,7 @@ static void data_dir_add(ListBase *lb, const char *member, const bool use_all) { LinkData *link; - if ((use_all == false) && strcmp(member, "scene") == 0) /* exception */ + if ((use_all == false) && STREQ(member, "scene")) /* exception */ return; if (BLI_findstring(lb, member, offsetof(LinkData, data))) @@ -548,7 +548,7 @@ ListBase CTX_data_dir_get(const bContext *C) bool CTX_data_equals(const char *member, const char *str) { - return (strcmp(member, str) == 0); + return (STREQ(member, str)); } bool CTX_data_dir(const char *member) |