diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-11-06 07:29:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-11-06 07:42:03 +0300 |
commit | 2d803d3f6d803ab6098410c56048f1df1ba48ee0 (patch) | |
tree | bf424d7588067f9c3350bf6030cbda0f12d5d50d /source/blender/makesrna | |
parent | 4f140ec7cc08e52eddae36f31bd7278506140679 (diff) |
Cleanup: use STR_ELEM macro
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 8 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index a16dcbac049..5aa684539af 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -29,6 +29,7 @@ #include "MEM_guardedalloc.h" +#include "BLI_string.h" #include "BLI_system.h" /* for 'BLI_system_backtrace' stub. */ #include "BLI_utildefines.h" @@ -760,9 +761,10 @@ static char *rna_def_property_get_func( fprintf(f, "static PointerRNA %s(CollectionPropertyIterator *iter)\n", func); fprintf(f, "{\n"); if (manualfunc) { - if (STREQ(manualfunc, "rna_iterator_listbase_get") || - STREQ(manualfunc, "rna_iterator_array_get") || - STREQ(manualfunc, "rna_iterator_array_dereference_get")) { + if (STR_ELEM(manualfunc, + "rna_iterator_listbase_get", + "rna_iterator_array_get", + "rna_iterator_array_dereference_get")) { fprintf(f, " return rna_pointer_inherit_refine(&iter->parent, &RNA_%s, %s(iter));\n", (cprop->item_type) ? (const char *)cprop->item_type : "UnknownType", diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index b5b538033f7..c132c434468 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1158,7 +1158,7 @@ static int rna_RenderSettings_stereoViews_skip(CollectionPropertyIterator *iter, ListBaseIterator *internal = &iter->internal.listbase; SceneRenderView *srv = (SceneRenderView *)internal->link; - if ((STREQ(srv->name, STEREO_LEFT_NAME)) || (STREQ(srv->name, STEREO_RIGHT_NAME))) { + if (STR_ELEM(srv->name, STEREO_LEFT_NAME, STEREO_RIGHT_NAME)) { return 0; } |