Revision: 41592
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41592
Author: lukastoenne
Date: 2011-11-06 15:40:00 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
Fix for bug #29046, the factor buffer input was not used correctly in curve
nodes.
Curve Map exec function (for RGB curves) used a broken test condition for
constant factor=1.0f eval. This must take the factor buffer into account,
checking the factor vec for default value is not sufficient. These kinds of
test should use a function interface, there are probably a lot more bugs like
this hidden in the code.
Modified Paths:
--------------
trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
2011-11-06 15:39:20 UTC (rev 41591)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
2011-11-06 15:40:00 UTC (rev 41592)
@@ -175,7 +175,7 @@
curvemapping_set_black_white(node->storage, in[2]->vec,
in[3]->vec);
- if(in[0]->vec[0] == 1.0)
+ if(in[0]->data==NULL && in[0]->vec[0] == 1.0)
composit1_pixel_processor(node, stackbuf, in[1]->data,
in[1]->vec, do_curves, CB_RGBA);
else
composit2_pixel_processor(node, stackbuf, in[1]->data,
in[1]->vec, in[0]->data, in[0]->vec, do_curves_fac, CB_RGBA, CB_VAL);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
