[Bf-blender-cvs] [22895d0f329] master: Cleanup: remove self-assignment

Campbell Barton noreply at git.blender.org
Mon Jan 4 07:41:51 CET 2021


Commit: 22895d0f329308f15e998a74c94ea605fb0eeae3
Author: Campbell Barton
Date:   Mon Jan 4 13:27:29 2021 +1100
Branches: master
https://developer.blender.org/rB22895d0f329308f15e998a74c94ea605fb0eeae3

Cleanup: remove self-assignment

Use CLAMP_MAX to remove redundant comparison.

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

M	source/blender/blenkernel/intern/fluid.c

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

diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index b93e6148b86..2dc7d3cc9e9 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -3652,7 +3652,7 @@ static int manta_step(
   }
 
   /* Total time must not exceed framecount times framelength. Correct tiny errors here. */
-  CLAMP(fds->time_total, fds->time_total, time_total_old + fds->frame_length);
+  CLAMP_MAX(fds->time_total, time_total_old + fds->frame_length);
 
   /* Compute shadow grid for gas simulations. Make sure to skip if bake job was canceled early. */
   if (fds->type == FLUID_DOMAIN_TYPE_GAS && result) {



More information about the Bf-blender-cvs mailing list