diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2016-07-31 08:22:36 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2016-07-31 08:22:36 +0300 |
| commit | fc36c2f70e13762bbd8e985a2e9435a0423a6db4 (patch) | |
| tree | 7cc56c464158c2cced215321089dda0633423f65 | |
| parent | 6fffe6cfcc1b3bef89b9e7a5546897276c71c3d8 (diff) | |
simplify redundant conditionals
The redundant terms were harmless but check an expression we already
know to be true (from earlier in the same conditional).
Found by PVS-Studio T48917
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_fluidsim_util.c | 2 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 4320699b8d7..47390578573 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -4663,7 +4663,7 @@ static bool drawDispList_nobackface(Scene *scene, View3D *v3d, RegionView3D *rv3 index3_nors_incr = true; } else { - if (!render_only || (render_only && BKE_displist_has_faces(lb))) { + if (!render_only || BKE_displist_has_faces(lb)) { return drawDispListwire(lb, ob->type); } } diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c index 77fbb482f8b..ffbbb1b0745 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.c +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c @@ -525,7 +525,7 @@ DerivedMesh *fluidsimModifier_do(FluidsimModifierData *fluidmd, Scene *scene, return dm; /* sanity check */ - if (!fluidmd || (fluidmd && !fluidmd->fss)) + if (!fluidmd || !fluidmd->fss) return dm; fss = fluidmd->fss; diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index c0d99d16a4c..b3061087344 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -1665,7 +1665,7 @@ static void update_anim_thread_func(TaskPool *pool, void *taskdata, int UNUSED(t // Only do deformers here if they are not parented to an armature, otherwise the armature will // handle updating its children - if (gameobj->GetDeformer() && (!parent || (parent && parent->GetGameObjectType() != SCA_IObject::OBJ_ARMATURE))) + if (gameobj->GetDeformer() && (!parent || parent->GetGameObjectType() != SCA_IObject::OBJ_ARMATURE)) gameobj->GetDeformer()->Update(); for (int j=0; j<children->GetCount(); ++j) { |