diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2016-07-22 04:31:37 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2016-07-22 09:17:52 +0300 |
| commit | 2b77b1ce465ab09052567a58d1b9f6a014a563cd (patch) | |
| tree | c7028d37887cd3b64b8e11f0cd5f3b7bda10a63c /source/blender/editors/transform/transform_conversions.c | |
| parent | bd52875dd67ea907273730c686d849828240e7b3 (diff) | |
remove double-checked conditions
Checking a condition right after we’ve checked it (and it hasn’t
changed). Most of these are trivial to understand.
split_quads in convertblender.c:
It seems quads should be processed and triangles should be marked as
not needing split. So I removed the outer vlr->v4 check.
Found with PVS-Studio T48917
Diffstat (limited to 'source/blender/editors/transform/transform_conversions.c')
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index fc32613c1ab..b7456facbdf 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -5273,13 +5273,9 @@ static void ObjectToTransData(TransInfo *t, TransData *td, Object *ob) skip_invert = true; if (skip_invert == false && constinv == false) { - if (constinv == false) - ob->transflag |= OB_NO_CONSTRAINTS; /* BKE_object_where_is_calc_time checks this */ - + ob->transflag |= OB_NO_CONSTRAINTS; /* BKE_object_where_is_calc_time checks this */ BKE_object_where_is_calc(t->scene, ob); - - if (constinv == false) - ob->transflag &= ~OB_NO_CONSTRAINTS; + ob->transflag &= ~OB_NO_CONSTRAINTS; } else BKE_object_where_is_calc(t->scene, ob); |