[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11807] branches/soc-2007-maike/release/ glsl: Rgb mix node generic functions correction
Miguel Torres Lima
torreslima at gmail.com
Fri Aug 24 17:39:51 CEST 2007
Revision: 11807
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11807
Author: maike
Date: 2007-08-24 17:39:51 +0200 (Fri, 24 Aug 2007)
Log Message:
-----------
Rgb mix node generic functions correction
Modified Paths:
--------------
branches/soc-2007-maike/release/glsl/node_rgbmix_add.gsl
branches/soc-2007-maike/release/glsl/node_rgbmix_burn.gsl
branches/soc-2007-maike/release/glsl/node_rgbmix_color.gsl
branches/soc-2007-maike/release/glsl/node_rgbmix_dark.gsl
branches/soc-2007-maike/release/glsl/node_rgbmix_diff.gsl
branches/soc-2007-maike/release/glsl/node_rgbmix_div.gsl
branches/soc-2007-maike/release/glsl/node_rgbmix_dodge.gsl
branches/soc-2007-maike/release/glsl/node_rgbmix_hue.gsl
branches/soc-2007-maike/release/glsl/node_rgbmix_light.gsl
branches/soc-2007-maike/release/glsl/node_rgbmix_mix.gsl
branches/soc-2007-maike/release/glsl/node_rgbmix_mul.gsl
branches/soc-2007-maike/release/glsl/node_rgbmix_overlay.gsl
branches/soc-2007-maike/release/glsl/node_rgbmix_sat.gsl
branches/soc-2007-maike/release/glsl/node_rgbmix_screen.gsl
branches/soc-2007-maike/release/glsl/node_rgbmix_sub.gsl
branches/soc-2007-maike/release/glsl/node_rgbmix_val.gsl
Modified: branches/soc-2007-maike/release/glsl/node_rgbmix_add.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_rgbmix_add.gsl 2007-08-24 12:32:57 UTC (rev 11806)
+++ branches/soc-2007-maike/release/glsl/node_rgbmix_add.gsl 2007-08-24 15:39:51 UTC (rev 11807)
@@ -2,5 +2,5 @@
{
float fact = clamp(fac, 0.0, 1.0);
- vect = colorband_blend_add(vect2, vect, fact);
+ vect = colorband_blend_add(vect2, vect1, fact);
}
Modified: branches/soc-2007-maike/release/glsl/node_rgbmix_burn.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_rgbmix_burn.gsl 2007-08-24 12:32:57 UTC (rev 11806)
+++ branches/soc-2007-maike/release/glsl/node_rgbmix_burn.gsl 2007-08-24 15:39:51 UTC (rev 11807)
@@ -2,5 +2,5 @@
{
float fact = clamp(fac, 0.0, 1.0);
- vect = colorband_blend_burn(vect2, vect, fact);
+ vect = colorband_blend_burn(vect2, vect1, fact);
}
Modified: branches/soc-2007-maike/release/glsl/node_rgbmix_color.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_rgbmix_color.gsl 2007-08-24 12:32:57 UTC (rev 11806)
+++ branches/soc-2007-maike/release/glsl/node_rgbmix_color.gsl 2007-08-24 15:39:51 UTC (rev 11807)
@@ -2,5 +2,5 @@
{
float fact = clamp(fac, 0.0, 1.0);
- vect = colorband_blend_color(vect2, vect, fact);
+ vect = colorband_blend_color(vect2, vect1, fact);
}
Modified: branches/soc-2007-maike/release/glsl/node_rgbmix_dark.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_rgbmix_dark.gsl 2007-08-24 12:32:57 UTC (rev 11806)
+++ branches/soc-2007-maike/release/glsl/node_rgbmix_dark.gsl 2007-08-24 15:39:51 UTC (rev 11807)
@@ -2,5 +2,5 @@
{
float fact = clamp(fac, 0.0, 1.0);
- vect = colorband_blend_dark(vect2, vect, fact);
+ vect = colorband_blend_dark(vect2, vect1, fact);
}
Modified: branches/soc-2007-maike/release/glsl/node_rgbmix_diff.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_rgbmix_diff.gsl 2007-08-24 12:32:57 UTC (rev 11806)
+++ branches/soc-2007-maike/release/glsl/node_rgbmix_diff.gsl 2007-08-24 15:39:51 UTC (rev 11807)
@@ -2,5 +2,5 @@
{
float fact = clamp(fac, 0.0, 1.0);
- vect = colorband_blend_diff(vect2, vect, fact);
+ vect = colorband_blend_dif(vect2, vect1, fact);
}
Modified: branches/soc-2007-maike/release/glsl/node_rgbmix_div.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_rgbmix_div.gsl 2007-08-24 12:32:57 UTC (rev 11806)
+++ branches/soc-2007-maike/release/glsl/node_rgbmix_div.gsl 2007-08-24 15:39:51 UTC (rev 11807)
@@ -2,5 +2,5 @@
{
float fact = clamp(fac, 0.0, 1.0);
- vect = colorband_blend_div(vect2, vect, fact);
+ vect = colorband_blend_div(vect2, vect1, fact);
}
Modified: branches/soc-2007-maike/release/glsl/node_rgbmix_dodge.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_rgbmix_dodge.gsl 2007-08-24 12:32:57 UTC (rev 11806)
+++ branches/soc-2007-maike/release/glsl/node_rgbmix_dodge.gsl 2007-08-24 15:39:51 UTC (rev 11807)
@@ -2,5 +2,5 @@
{
float fact = clamp(fac, 0.0, 1.0);
- vect = colorband_blend_dodge(vect2, vect, fact);
+ vect = colorband_blend_dodge(vect2, vect1, fact);
}
Modified: branches/soc-2007-maike/release/glsl/node_rgbmix_hue.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_rgbmix_hue.gsl 2007-08-24 12:32:57 UTC (rev 11806)
+++ branches/soc-2007-maike/release/glsl/node_rgbmix_hue.gsl 2007-08-24 15:39:51 UTC (rev 11807)
@@ -2,5 +2,5 @@
{
float fact = clamp(fac, 0.0, 1.0);
- vect = colorband_blend_hue(vect2, vect, fact);
+ vect = colorband_blend_hue(vect2, vect1, fact);
}
Modified: branches/soc-2007-maike/release/glsl/node_rgbmix_light.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_rgbmix_light.gsl 2007-08-24 12:32:57 UTC (rev 11806)
+++ branches/soc-2007-maike/release/glsl/node_rgbmix_light.gsl 2007-08-24 15:39:51 UTC (rev 11807)
@@ -2,5 +2,5 @@
{
float fact = clamp(fac, 0.0, 1.0);
- vect = colorband_blend_light(vect2, vect, fact);
+ vect = colorband_blend_light(vect2, vect1, fact);
}
Modified: branches/soc-2007-maike/release/glsl/node_rgbmix_mix.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_rgbmix_mix.gsl 2007-08-24 12:32:57 UTC (rev 11806)
+++ branches/soc-2007-maike/release/glsl/node_rgbmix_mix.gsl 2007-08-24 15:39:51 UTC (rev 11807)
@@ -2,5 +2,5 @@
{
float fact = clamp(fac, 0.0, 1.0);
- vect = colorband_blend_mix(vect2, vect, fact);
+ vect = colorband_blend_mix(vect2, vect1, fact);
}
Modified: branches/soc-2007-maike/release/glsl/node_rgbmix_mul.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_rgbmix_mul.gsl 2007-08-24 12:32:57 UTC (rev 11806)
+++ branches/soc-2007-maike/release/glsl/node_rgbmix_mul.gsl 2007-08-24 15:39:51 UTC (rev 11807)
@@ -2,5 +2,5 @@
{
float fact = clamp(fac, 0.0, 1.0);
- vect = colorband_blend_mul(vect2, vect, fact);
+ vect = colorband_blend_mult(vect2, vect1, fact);
}
Modified: branches/soc-2007-maike/release/glsl/node_rgbmix_overlay.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_rgbmix_overlay.gsl 2007-08-24 12:32:57 UTC (rev 11806)
+++ branches/soc-2007-maike/release/glsl/node_rgbmix_overlay.gsl 2007-08-24 15:39:51 UTC (rev 11807)
@@ -2,5 +2,5 @@
{
float fact = clamp(fac, 0.0, 1.0);
- vect = colorband_blend_overlay(vect2, vect, fact);
+ vect = colorband_blend_overlay(vect2, vect1, fact);
}
Modified: branches/soc-2007-maike/release/glsl/node_rgbmix_sat.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_rgbmix_sat.gsl 2007-08-24 12:32:57 UTC (rev 11806)
+++ branches/soc-2007-maike/release/glsl/node_rgbmix_sat.gsl 2007-08-24 15:39:51 UTC (rev 11807)
@@ -2,5 +2,5 @@
{
float fact = clamp(fac, 0.0, 1.0);
- vect = colorband_blend_sat(vect2, vect, fact);
+ vect = colorband_blend_sat(vect2, vect1, fact);
}
Modified: branches/soc-2007-maike/release/glsl/node_rgbmix_screen.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_rgbmix_screen.gsl 2007-08-24 12:32:57 UTC (rev 11806)
+++ branches/soc-2007-maike/release/glsl/node_rgbmix_screen.gsl 2007-08-24 15:39:51 UTC (rev 11807)
@@ -2,5 +2,5 @@
{
float fact = clamp(fac, 0.0, 1.0);
- vect = colorband_blend_screen(vect2, vect, fact);
+ vect = colorband_blend_screen(vect2, vect1, fact);
}
Modified: branches/soc-2007-maike/release/glsl/node_rgbmix_sub.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_rgbmix_sub.gsl 2007-08-24 12:32:57 UTC (rev 11806)
+++ branches/soc-2007-maike/release/glsl/node_rgbmix_sub.gsl 2007-08-24 15:39:51 UTC (rev 11807)
@@ -2,5 +2,5 @@
{
float fact = clamp(fac, 0.0, 1.0);
- vect = colorband_blend_sub(vect2, vect, fact);
+ vect = colorband_blend_sub(vect2, vect1, fact);
}
Modified: branches/soc-2007-maike/release/glsl/node_rgbmix_val.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_rgbmix_val.gsl 2007-08-24 12:32:57 UTC (rev 11806)
+++ branches/soc-2007-maike/release/glsl/node_rgbmix_val.gsl 2007-08-24 15:39:51 UTC (rev 11807)
@@ -2,5 +2,5 @@
{
float fact = clamp(fac, 0.0, 1.0);
- vect = colorband_blend_val(vect2, vect, fact);
+ vect = colorband_blend_val(vect2, vect1, fact);
}
More information about the Bf-blender-cvs
mailing list