Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Erwin <significant.bit@gmail.com>2016-07-31 08:22:36 +0300
committerMike Erwin <significant.bit@gmail.com>2016-07-31 08:22:36 +0300
commitfc36c2f70e13762bbd8e985a2e9435a0423a6db4 (patch)
tree7cc56c464158c2cced215321089dda0633423f65 /source/gameengine/Ketsji
parent6fffe6cfcc1b3bef89b9e7a5546897276c71c3d8 (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
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r--source/gameengine/Ketsji/KX_Scene.cpp2
1 files changed, 1 insertions, 1 deletions
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) {