Commit: 5bbe818aeba4ff7189f5149840c4268cf2e0c97a
Author: Sergey Sharybin
Date: Fri Oct 6 14:25:37 2017 +0500
Branches: master
https://developer.blender.org/rB5bbe818aeba4ff7189f5149840c4268cf2e0c97a
Sequencer: Use funciton instead of macr oto avoid argument re-evaluation
===================================================================
M source/blender/blenkernel/intern/seqeffects.c
===================================================================
diff --git a/source/blender/blenkernel/intern/seqeffects.c
b/source/blender/blenkernel/intern/seqeffects.c
index 894bc3c726f..102cd06ca81 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -2027,10 +2027,10 @@ static void RVAddBitmaps_float(float *a, float *b,
float *c, int width, int heig
for (y = 0; y < height; y++) {
for (x = 0; x < width; x++) {
index = (x + y * width) * 4;
- c[index + GlowR] = MIN2(1.0f, a[index + GlowR] +
b[index + GlowR]);
- c[index + GlowG] = MIN2(1.0f, a[index + GlowG] +
b[index + GlowG]);
- c[index + GlowB] = MIN2(1.0f, a[index + GlowB] +
b[index + GlowB]);
- c[index + GlowA] = MIN2(1.0f, a[index + GlowA] +
b[index + GlowA]);
+ c[index + GlowR] = min_ff(1.0f, a[index + GlowR] +
b[index + GlowR]);
+ c[index + GlowG] = min_ff(1.0f, a[index + GlowG] +
b[index + GlowG]);
+ c[index + GlowB] = min_ff(1.0f, a[index + GlowB] +
b[index + GlowB]);
+ c[index + GlowA] = min_ff(1.0f, a[index + GlowA] +
b[index + GlowA]);
}
}
}
@@ -2047,10 +2047,10 @@ static void RVIsolateHighlights_float(float *in, float
*out, int width, int heig
/* Isolate the intensity */
intensity = (in[index + GlowR] + in[index + GlowG] +
in[index + GlowB] - threshold);
if (intensity > 0) {
- out[index + GlowR] = MIN2(clamp, (in[index +
GlowR] * boost * intensity));
- out[index + GlowG] = MIN2(clamp, (in[index +
GlowG] * boost * intensity));
- out[index + GlowB] = MIN2(clamp, (in[index +
GlowB] * boost * intensity));
- out[index + GlowA] = MIN2(clamp, (in[index +
GlowA] * boost * intensity));
+ out[index + GlowR] = min_ff(clamp, (in[index +
GlowR] * boost * intensity));
+ out[index + GlowG] = min_ff(clamp, (in[index +
GlowG] * boost * intensity));
+ out[index + GlowB] = min_ff(clamp, (in[index +
GlowB] * boost * intensity));
+ out[index + GlowA] = min_ff(clamp, (in[index +
GlowA] * boost * intensity));
}
else {
out[index + GlowR] = 0;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
