[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30082] branches/render25/source/blender: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/ blender -r30079:30081
Campbell Barton
ideasman42 at gmail.com
Wed Jul 7 17:09:35 CEST 2010
Revision: 30082
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30082
Author: campbellbarton
Date: 2010-07-07 17:09:35 +0200 (Wed, 07 Jul 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30079:30081
Modified Paths:
--------------
branches/render25/source/blender/blenkernel/intern/sequencer.c
branches/render25/source/blender/editors/space_sequencer/sequencer_draw.c
Modified: branches/render25/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/sequencer.c 2010-07-07 15:06:57 UTC (rev 30081)
+++ branches/render25/source/blender/blenkernel/intern/sequencer.c 2010-07-07 15:09:35 UTC (rev 30082)
@@ -1536,9 +1536,14 @@
}
/* note: lift is actually 2-lift */
-MINLINE float color_balance_fl(float v, const float lift, const float gain, const float gamma, const float mul)
+MINLINE float color_balance_fl(float in, const float lift, const float gain, const float gamma, const float mul)
{
- return powf((((v - 1.0f) * lift) + 1.0f) * gain, gamma) * mul;
+ float x= (((in - 1.0f) * lift) + 1.0f) * gain;
+
+ /* prevent NaN */
+ if (x < 0.f) x = 0.f;
+
+ return powf(x, gamma) * mul;
}
static void make_cb_table_byte(float lift, float gain, float gamma,
Modified: branches/render25/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- branches/render25/source/blender/editors/space_sequencer/sequencer_draw.c 2010-07-07 15:06:57 UTC (rev 30081)
+++ branches/render25/source/blender/editors/space_sequencer/sequencer_draw.c 2010-07-07 15:09:35 UTC (rev 30082)
@@ -369,17 +369,17 @@
{
float x1, x2, y1, y2, pixely, a;
char col[3], blendcol[3];
- View2D *v2d;
+ View2D *v2d= &sseq->v2d;
if(seq->type >= SEQ_EFFECT) return;
+ if(v2d->mask.ymax == v2d->mask.ymin) return; /* avoid divide by zero */
x1= seq->startdisp;
x2= seq->enddisp;
y1= seq->machine+SEQ_STRIP_OFSBOTTOM;
y2= seq->machine+SEQ_STRIP_OFSTOP;
-
- v2d = &sseq->v2d;
+
pixely = (v2d->cur.ymax - v2d->cur.ymin)/(v2d->mask.ymax - v2d->mask.ymin);
blendcol[0] = blendcol[1] = blendcol[2] = 120;
More information about the Bf-blender-cvs
mailing list