[Bf-blender-cvs] [57b3878] master: Code cleanup: avoid using function calls within macros

Campbell Barton noreply at git.blender.org
Fri Nov 29 05:26:39 CET 2013


Commit: 57b3878efb17e0f43b465124e581e72b16da3346
Author: Campbell Barton
Date:   Fri Nov 29 13:59:32 2013 +1100
http://developer.blender.org/rB57b3878efb17e0f43b465124e581e72b16da3346

Code cleanup: avoid using function calls within macros

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

M	source/blender/windowmanager/intern/wm_playanim.c

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

diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c
index a02fc75..8456be3 100644
--- a/source/blender/windowmanager/intern/wm_playanim.c
+++ b/source/blender/windowmanager/intern/wm_playanim.c
@@ -895,17 +895,20 @@ static char *wm_main_playanim_intern(int argc, const char **argv)
 					}
 					break;
 				case 's':
-					sfra = MIN2(MAXFRAME, MAX2(1, atoi(argv[2]) ));
+					sfra = atoi(argv[2]);
+					CLAMP(sfra, 1, MAXFRAME);
 					argc--;
 					argv++;
 					break;
 				case 'e':
-					efra = MIN2(MAXFRAME, MAX2(1, atoi(argv[2]) ));
+					efra = atoi(argv[2]);
+					CLAMP(efra, 1, MAXFRAME);
 					argc--;
 					argv++;
 					break;
 				case 'j':
-					ps.fstep = MIN2(MAXFRAME, MAX2(1, atoi(argv[2])));
+					ps.fstep = atoi(argv[2]);
+					CLAMP(ps.fstep, 1, MAXFRAME);
 					swaptime *= ps.fstep;
 					argc--;
 					argv++;




More information about the Bf-blender-cvs mailing list