[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30232] branches/render25/source/blender: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/ blender -r30229:30231
Campbell Barton
ideasman42 at gmail.com
Mon Jul 12 18:21:48 CEST 2010
Revision: 30232
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30232
Author: campbellbarton
Date: 2010-07-12 18:21:48 +0200 (Mon, 12 Jul 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30229:30231
Modified Paths:
--------------
branches/render25/source/blender/blenkernel/intern/sequencer.c
branches/render25/source/blender/editors/interface/interface_regions.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
Modified: branches/render25/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/sequencer.c 2010-07-12 16:20:51 UTC (rev 30231)
+++ branches/render25/source/blender/blenkernel/intern/sequencer.c 2010-07-12 16:21:48 UTC (rev 30232)
@@ -1509,6 +1509,11 @@
if(cb.flag & SEQ_COLOR_BALANCE_INVERSE_LIFT) {
for (c = 0; c < 3; c++) {
+ /* tweak to give more subtle results
+ * values above 1.0 are scaled */
+ if(cb.lift[c] > 1.0f)
+ cb.lift[c] = pow(cb.lift[c] - 1.0f, 2.0f) + 1.0f;
+
cb.lift[c] = 2.0f - cb.lift[c];
}
}
Modified: branches/render25/source/blender/editors/interface/interface_regions.c
===================================================================
--- branches/render25/source/blender/editors/interface/interface_regions.c 2010-07-12 16:20:51 UTC (rev 30231)
+++ branches/render25/source/blender/editors/interface/interface_regions.c 2010-07-12 16:21:48 UTC (rev 30232)
@@ -1832,11 +1832,11 @@
/* RGB values */
uiBlockBeginAlign(block);
- bt= uiDefButR(block, NUMSLI, 0, "R ", 0, -60, butwidth, UI_UNIT_Y, ptr, propname, 0, 0.0, 0.0, 0, 0, "");
+ bt= uiDefButR(block, NUMSLI, 0, "R ", 0, -60, butwidth, UI_UNIT_Y, ptr, propname, 0, 0.0, 0.0, 0, 3, "");
uiButSetFunc(bt, do_picker_rna_cb, bt, NULL);
- bt= uiDefButR(block, NUMSLI, 0, "G ", 0, -80, butwidth, UI_UNIT_Y, ptr, propname, 1, 0.0, 0.0, 0, 0, "");
+ bt= uiDefButR(block, NUMSLI, 0, "G ", 0, -80, butwidth, UI_UNIT_Y, ptr, propname, 1, 0.0, 0.0, 0, 3, "");
uiButSetFunc(bt, do_picker_rna_cb, bt, NULL);
- bt= uiDefButR(block, NUMSLI, 0, "B ", 0, -100, butwidth, UI_UNIT_Y, ptr, propname, 2, 0.0, 0.0, 0, 0, "");
+ bt= uiDefButR(block, NUMSLI, 0, "B ", 0, -100, butwidth, UI_UNIT_Y, ptr, propname, 2, 0.0, 0.0, 0, 3, "");
uiButSetFunc(bt, do_picker_rna_cb, bt, NULL);
// could use uiItemFullR(col, ptr, prop, -1, 0, UI_ITEM_R_EXPAND|UI_ITEM_R_SLIDER, "", 0);
Modified: branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
===================================================================
--- branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c 2010-07-12 16:20:51 UTC (rev 30231)
+++ branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c 2010-07-12 16:21:48 UTC (rev 30232)
@@ -124,8 +124,16 @@
{
NodeColorBalance *n= (NodeColorBalance *)node->storage;
int c;
+
+ copy_v3_v3(n->lift_lgg, n->lift);
+
for (c = 0; c < 3; c++) {
- n->lift_lgg[c] = 2.0f - n->lift[c];
+ /* tweak to give more subtle results
+ * values above 1.0 are scaled */
+ if(n->lift_lgg[c] > 1.0f)
+ n->lift_lgg[c] = pow(n->lift_lgg[c] - 1.0f, 2.0f) + 1.0f;
+
+ n->lift_lgg[c] = 2.0f - n->lift_lgg[c];
}
}
More information about the Bf-blender-cvs
mailing list