diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-26 18:03:11 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-26 18:59:24 +0300 |
commit | fca515838e70f8bec7028b840bb921a1be9fabbb (patch) | |
tree | 1752923de19eca5f01ca4cfb5754fd4d1f13d934 /source/blender/render | |
parent | d44890ee75634052f325531766a661a5bcef628f (diff) |
Cleanup: strcmp/strncmp -> STREQ/STREQLEN (in boolean usage).
Makes usage of those funcs much more clear, we even had mixed '!strcmp(foo, bar)'
and 'strcmp(foo, bar) == 0' in several places...
Diffstat (limited to 'source/blender/render')
4 files changed, 35 insertions, 35 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 7605d7d9ea7..1e30e05fe1a 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -256,7 +256,7 @@ Render *RE_GetRender(const char *name) /* search for existing renders */ for (re = RenderGlobal.renderlist.first; re; re = re->next) - if (strncmp(re->name, name, RE_MAXNAME) == 0) + if (STREQLEN(re->name, name, RE_MAXNAME)) break; return re; diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index 0d859f81e0c..6486844bacf 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -309,97 +309,97 @@ static const char *get_pass_name(int passtype, int channel) static int passtype_from_name(const char *str) { - if (strcmp(str, "Combined") == 0) + if (STREQ(str, "Combined")) return SCE_PASS_COMBINED; - if (strcmp(str, "Depth") == 0) + if (STREQ(str, "Depth")) return SCE_PASS_Z; - if (strcmp(str, "Vector") == 0) + if (STREQ(str, "Vector")) return SCE_PASS_VECTOR; - if (strcmp(str, "Normal") == 0) + if (STREQ(str, "Normal")) return SCE_PASS_NORMAL; - if (strcmp(str, "UV") == 0) + if (STREQ(str, "UV")) return SCE_PASS_UV; - if (strcmp(str, "Color") == 0) + if (STREQ(str, "Color")) return SCE_PASS_RGBA; - if (strcmp(str, "Emit") == 0) + if (STREQ(str, "Emit")) return SCE_PASS_EMIT; - if (strcmp(str, "Diffuse") == 0) + if (STREQ(str, "Diffuse")) return SCE_PASS_DIFFUSE; - if (strcmp(str, "Spec") == 0) + if (STREQ(str, "Spec")) return SCE_PASS_SPEC; - if (strcmp(str, "Shadow") == 0) + if (STREQ(str, "Shadow")) return SCE_PASS_SHADOW; - if (strcmp(str, "AO") == 0) + if (STREQ(str, "AO")) return SCE_PASS_AO; - if (strcmp(str, "Env") == 0) + if (STREQ(str, "Env")) return SCE_PASS_ENVIRONMENT; - if (strcmp(str, "Indirect") == 0) + if (STREQ(str, "Indirect")) return SCE_PASS_INDIRECT; - if (strcmp(str, "Reflect") == 0) + if (STREQ(str, "Reflect")) return SCE_PASS_REFLECT; - if (strcmp(str, "Refract") == 0) + if (STREQ(str, "Refract")) return SCE_PASS_REFRACT; - if (strcmp(str, "IndexOB") == 0) + if (STREQ(str, "IndexOB")) return SCE_PASS_INDEXOB; - if (strcmp(str, "IndexMA") == 0) + if (STREQ(str, "IndexMA")) return SCE_PASS_INDEXMA; - if (strcmp(str, "Mist") == 0) + if (STREQ(str, "Mist")) return SCE_PASS_MIST; - if (strcmp(str, "RayHits") == 0) + if (STREQ(str, "RayHits")) return SCE_PASS_RAYHITS; - if (strcmp(str, "DiffDir") == 0) + if (STREQ(str, "DiffDir")) return SCE_PASS_DIFFUSE_DIRECT; - if (strcmp(str, "DiffInd") == 0) + if (STREQ(str, "DiffInd")) return SCE_PASS_DIFFUSE_INDIRECT; - if (strcmp(str, "DiffCol") == 0) + if (STREQ(str, "DiffCol")) return SCE_PASS_DIFFUSE_COLOR; - if (strcmp(str, "GlossDir") == 0) + if (STREQ(str, "GlossDir")) return SCE_PASS_GLOSSY_DIRECT; - if (strcmp(str, "GlossInd") == 0) + if (STREQ(str, "GlossInd")) return SCE_PASS_GLOSSY_INDIRECT; - if (strcmp(str, "GlossCol") == 0) + if (STREQ(str, "GlossCol")) return SCE_PASS_GLOSSY_COLOR; - if (strcmp(str, "TransDir") == 0) + if (STREQ(str, "TransDir")) return SCE_PASS_TRANSM_DIRECT; - if (strcmp(str, "TransInd") == 0) + if (STREQ(str, "TransInd")) return SCE_PASS_TRANSM_INDIRECT; - if (strcmp(str, "TransCol") == 0) + if (STREQ(str, "TransCol")) return SCE_PASS_TRANSM_COLOR; - if (strcmp(str, "SubsurfaceDir") == 0) + if (STREQ(str, "SubsurfaceDir")) return SCE_PASS_SUBSURFACE_DIRECT; - if (strcmp(str, "SubsurfaceInd") == 0) + if (STREQ(str, "SubsurfaceInd")) return SCE_PASS_SUBSURFACE_INDIRECT; - if (strcmp(str, "SubsurfaceCol") == 0) + if (STREQ(str, "SubsurfaceCol")) return SCE_PASS_SUBSURFACE_COLOR; return 0; @@ -509,7 +509,7 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf for (nr = 0, srl = re->r.layers.first; srl; srl = srl->next, nr++) { if (layername && layername[0]) - if (strcmp(srl->name, layername) != 0) + if (!STREQ(srl->name, layername)) continue; if (re->r.scemode & R_SINGLE_LAYER) { diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index b1e00c4a451..c738fc3e06a 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -2249,7 +2249,7 @@ void do_material_tex(ShadeInput *shi, Render *re) if (mtex->uvname[0] != 0) { for (i = 0; i < shi->totuv; i++) { - if (strcmp(shi->uv[i].name, mtex->uvname)==0) { + if (STREQ(shi->uv[i].name, mtex->uvname)) { suv= &shi->uv[i]; break; } diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index 93e8c6a275a..63a97a04b39 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -2064,7 +2064,7 @@ float RE_lamp_get_data(ShadeInput *shi, Object *lamp_obj, float col[4], float lv if (R.r.scemode & R_BUTS_PREVIEW) { for (go = R.lights.first; go; go = go->next) { /* "Lamp.002" is main key light of material preview */ - if (strcmp(go->ob->id.name + 2, "Lamp.002") == 0) + if (STREQ(go->ob->id.name + 2, "Lamp.002")) return lamp_get_data_internal(shi, go, col, lv, dist, shadow); } return 0.0f; |