[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44238] trunk/blender/source: replace MIN2 / MAX2 with minf / maxf to avoid calling functions multiple times.
Campbell Barton
ideasman42 at gmail.com
Sun Feb 19 06:11:35 CET 2012
Revision: 44238
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44238
Author: campbellbarton
Date: 2012-02-19 05:11:24 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
replace MIN2 / MAX2 with minf / maxf to avoid calling functions multiple times.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
trunk/blender/source/blender/render/intern/source/pixelshading.c
trunk/blender/source/blender/render/intern/source/shadeoutput.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-02-19 04:13:52 UTC (rev 44237)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-02-19 05:11:24 UTC (rev 44238)
@@ -1697,7 +1697,7 @@
hyp2 = fabsf(angle*x+y+(-(yo-posy*0.5f)-angle*(xo-posx*0.5f)))*wipezone->pythangle;
}
- hwidth= MIN2(hwidth, fabsf(b3-b1)/2.0f);
+ hwidth = minf(hwidth, fabsf(b3-b1)/2.0f);
if(b2 < b1 && b2 < b3 ){
output = in_band(hwidth,hyp,0,1);
Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_edit.c 2012-02-19 04:13:52 UTC (rev 44237)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c 2012-02-19 05:11:24 UTC (rev 44238)
@@ -3472,7 +3472,7 @@
view3d_operator_needs_opengl(C);
selected= (short)count_selected_keys(scene, edit);
- dmax = MAX2(fabs(dx), fabs(dy));
+ dmax = maxf(fabsf(dx), fabsf(dy));
tot_steps = dmax/(0.2f * brush->size) + 1;
dx /= (float)tot_steps;
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2012-02-19 04:13:52 UTC (rev 44237)
+++ trunk/blender/source/blender/editors/transform/transform.c 2012-02-19 05:11:24 UTC (rev 44238)
@@ -4881,8 +4881,8 @@
upVert = editedge_getOtherVert(tempsv->up, centerVert);
downVert = editedge_getOtherVert(tempsv->down, centerVert);
- len = MIN2(perc, len_v3v3(upVert->co,downVert->co));
- len = MAX2(len, 0);
+ len = minf(perc, len_v3v3(upVert->co, downVert->co));
+ len = maxf(len, 0.0f);
//Adjust Edgeloop
if(prop) {
Modified: trunk/blender/source/blender/gpu/intern/gpu_material.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_material.c 2012-02-19 04:13:52 UTC (rev 44237)
+++ trunk/blender/source/blender/gpu/intern/gpu_material.c 2012-02-19 05:11:24 UTC (rev 44238)
@@ -1071,7 +1071,7 @@
else
newnor = tnor;
- norfac = MIN2(fabsf(mtex->norfac), 1.0f);
+ norfac = minf(fabsf(mtex->norfac), 1.0f);
if(norfac == 1.0f && !GPU_link_changed(stencil)) {
shi->vn = newnor;
Modified: trunk/blender/source/blender/render/intern/source/pixelshading.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pixelshading.c 2012-02-19 04:13:52 UTC (rev 44237)
+++ trunk/blender/source/blender/render/intern/source/pixelshading.c 2012-02-19 05:11:24 UTC (rev 44238)
@@ -161,7 +161,7 @@
copy_v3_v3(lvrot, lv);
mul_m3_v3(lar->imat, lvrot);
- x= MAX2(fabs(lvrot[0]/lvrot[2]) , fabs(lvrot[1]/lvrot[2]));
+ x = maxf(fabsf(lvrot[0]/lvrot[2]), fabsf(lvrot[1]/lvrot[2]));
/* 1.0/(sqrt(1+x*x)) is equivalent to cos(atan(x)) */
inpr= 1.0/(sqrt(1.0f+x*x));
Modified: trunk/blender/source/blender/render/intern/source/shadeoutput.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/shadeoutput.c 2012-02-19 04:13:52 UTC (rev 44237)
+++ trunk/blender/source/blender/render/intern/source/shadeoutput.c 2012-02-19 05:11:24 UTC (rev 44238)
@@ -1204,7 +1204,7 @@
copy_v3_v3(lvrot, lv);
mul_m3_v3(lar->imat, lvrot);
- x= MAX2(fabs(lvrot[0]/lvrot[2]) , fabs(lvrot[1]/lvrot[2]));
+ x = maxf(fabsf(lvrot[0]/lvrot[2]), fabsf(lvrot[1]/lvrot[2]));
/* 1.0f/(sqrt(1+x*x)) is equivalent to cos(atan(x)) */
inpr= 1.0f/(sqrt(1.0f+x*x));
Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c 2012-02-19 04:13:52 UTC (rev 44237)
+++ trunk/blender/source/creator/creator.c 2012-02-19 05:11:24 UTC (rev 44238)
@@ -727,7 +727,7 @@
BKE_reports_init(&reports, RPT_PRINT);
- frame = MIN2(MAXFRAME, MAX2(MINAFRAME, frame));
+ frame = CLAMPIS(frame, MINAFRAME, MAXFRAME);
RE_SetReports(re, &reports);
RE_BlenderAnim(re, bmain, scene, NULL, scene->lay, frame, frame, scene->r.frame_step);
More information about the Bf-blender-cvs
mailing list