diff options
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/convertblender.c | 6 | ||||
-rw-r--r-- | source/blender/render/intern/source/occlusion.c | 2 | ||||
-rw-r--r-- | source/blender/render/intern/source/rayshade.c | 4 | ||||
-rw-r--r-- | source/blender/render/intern/source/sss.c | 4 | ||||
-rw-r--r-- | source/blender/render/intern/source/strand.c | 13 | ||||
-rw-r--r-- | source/blender/render/intern/source/volume_precache.c | 2 |
6 files changed, 16 insertions, 15 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 1fd10f83389..b69f9518c1a 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -4331,7 +4331,7 @@ static void finalize_render_object(Render *re, ObjectRen *obr, int timeoffset) if ((a & 255)==0) ver= obr->vertnodes[a>>8].vert; else ver++; - DO_MINMAX(ver->co, min, max); + minmax_v3v3_v3(min, max, ver->co); } if (obr->strandbuf) { @@ -4357,8 +4357,8 @@ static void finalize_render_object(Render *re, ObjectRen *obr, int timeoffset) copy_v3_v3(sbound->boundbox[0], smin); copy_v3_v3(sbound->boundbox[1], smax); - DO_MINMAX(smin, min, max); - DO_MINMAX(smax, min, max); + minmax_v3v3_v3(min, max, smin); + minmax_v3v3_v3(min, max, smax); } } diff --git a/source/blender/render/intern/source/occlusion.c b/source/blender/render/intern/source/occlusion.c index 03767dfa391..21e4e216063 100644 --- a/source/blender/render/intern/source/occlusion.c +++ b/source/blender/render/intern/source/occlusion.c @@ -402,7 +402,7 @@ static int occ_find_bbox_axis(OcclusionTree *tree, int begin, int end, float *mi INIT_MINMAX(min, max); for (a = begin; a < end; a++) { - DO_MINMAX(tree->co[a], min, max); + minmax_v3v3_v3(min, max, tree->co[a]); } for (a=0; a<3; a++) { diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index c68fb578d4c..f550cd82061 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -2234,8 +2234,8 @@ static void ray_shadow_qmc(ShadeInput *shi, LampRen *lar, const float lampco[3], QMC_initPixel(qsa, shi->thread); INIT_MINMAX(min, max); - for (i=0; i<totjitco; i++) { - DO_MINMAX(jitco[i], min, max); + for (i = 0; i < totjitco; i++) { + minmax_v3v3_v3(min, max, jitco[i]); } RE_rayobject_hint_bb(R.raytree, &bb_hint, min, max); diff --git a/source/blender/render/intern/source/sss.c b/source/blender/render/intern/source/sss.c index cbcc63148e9..c8a37998169 100644 --- a/source/blender/render/intern/source/sss.c +++ b/source/blender/render/intern/source/sss.c @@ -762,8 +762,8 @@ ScatterTree *scatter_tree_new(ScatterSettings *ss[3], float scale, float error, points[i].area= fabsf(area[i])/(tree->scale*tree->scale); points[i].back= (area[i] < 0.0f); - mul_v3_fl(points[i].co, 1.0f/tree->scale); - DO_MINMAX(points[i].co, tree->min, tree->max); + mul_v3_fl(points[i].co, 1.0f / tree->scale); + minmax_v3v3_v3(tree->min, tree->max, points[i].co); refpoints[i]= points + i; } diff --git a/source/blender/render/intern/source/strand.c b/source/blender/render/intern/source/strand.c index cc824087c87..6690425967c 100644 --- a/source/blender/render/intern/source/strand.c +++ b/source/blender/render/intern/source/strand.c @@ -1063,18 +1063,19 @@ void free_strand_surface(Render *re) void strand_minmax(StrandRen *strand, float min[3], float max[3], const float width) { StrandVert *svert; - float vec[3], width2= 2.0f*width; + const float width2 = width * 2.0f; + float vec[3]; int a; for (a=0, svert=strand->vert; a<strand->totvert; a++, svert++) { copy_v3_v3(vec, svert->co); - DO_MINMAX(vec, min, max); + minmax_v3v3_v3(min, max, vec); if (width!=0.0f) { - vec[0]+= width; vec[1]+= width; vec[2]+= width; - DO_MINMAX(vec, min, max); - vec[0]-= width2; vec[1]-= width2; vec[2]-= width2; - DO_MINMAX(vec, min, max); + add_v3_fl(vec, width); + minmax_v3v3_v3(min, max, vec); + add_v3_fl(vec, -width2); + minmax_v3v3_v3(min, max, vec); } } } diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c index ff715eeca07..ea6b9b890ac 100644 --- a/source/blender/render/intern/source/volume_precache.c +++ b/source/blender/render/intern/source/volume_precache.c @@ -150,7 +150,7 @@ void global_bounds_obi(Render *re, ObjectInstanceRen *obi, float *bbmin, float * /* convert to global space */ mul_m4_v3(re->viewinv, co); - DO_MINMAX(co, vp->bbmin, vp->bbmax); + minmax_v3v3_v3(vp->bbmin, vp->bbmax, co); } copy_v3_v3(bbmin, vp->bbmin); |