[Bf-blender-cvs] [f76d9de7ed6] master: Cleanup: Clang-tidy bugprone-redundant-branch-condition

Ankit Meel noreply at git.blender.org
Tue Oct 20 21:40:14 CEST 2020


Commit: f76d9de7ed69f830e75613fedcb3b6e1026219b8
Author: Ankit Meel
Date:   Tue Oct 20 22:40:07 2020 +0530
Branches: master
https://developer.blender.org/rBf76d9de7ed69f830e75613fedcb3b6e1026219b8

Cleanup: Clang-tidy bugprone-redundant-branch-condition

No functional change.

===================================================================

M	source/blender/blenkernel/intern/particle.c
M	source/blender/editors/space_view3d/view3d_view.c

===================================================================

diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index b978236da06..7b8ee7343ee 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -4384,7 +4384,7 @@ void psys_get_particle_on_path(ParticleSimulationData *sim,
         t = psys_get_child_time(psys, cpa, -state->time, NULL, NULL);
       }
 
-      if (totchild && part->childtype == PART_CHILD_FACES) {
+      if (part->childtype == PART_CHILD_FACES) {
         /* part->parents could still be 0 so we can't test with totparent */
         between = 1;
       }
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index 0985d65d5f8..0f0a710a82a 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -1019,10 +1019,10 @@ int view3d_opengl_select(ViewContext *vc,
   }
 
   if (is_pick_select) {
-    if (is_pick_select && select_mode == VIEW3D_SELECT_PICK_NEAREST) {
+    if (select_mode == VIEW3D_SELECT_PICK_NEAREST) {
       gpu_select_mode = GPU_SELECT_PICK_NEAREST;
     }
-    else if (is_pick_select && select_mode == VIEW3D_SELECT_PICK_ALL) {
+    else if (select_mode == VIEW3D_SELECT_PICK_ALL) {
       gpu_select_mode = GPU_SELECT_PICK_ALL;
     }
     else {



More information about the Bf-blender-cvs mailing list