Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2014-02-14 19:00:28 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2014-02-14 19:03:45 +0400
commit42946c37c789b5a57c45ff2637c79d194beb33d0 (patch)
tree2d12bd88cf5a17370d697fdc6cca99e5bacd4adc /source/blender/makesdna
parente1d9308616b00ebe350056258f56fe2775a085ed (diff)
Fix T38606: C curve in the curve mapping compositing node not extrapolating correct.
The "premultiply" optimization here did not take the extrapolation into account.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_color_types.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_color_types.h b/source/blender/makesdna/DNA_color_types.h
index 50bbc04ccb1..e3731129632 100644
--- a/source/blender/makesdna/DNA_color_types.h
+++ b/source/blender/makesdna/DNA_color_types.h
@@ -60,7 +60,10 @@ typedef struct CurveMap {
float ext_in[2], ext_out[2]; /* for extrapolated curves, the direction vector */
CurveMapPoint *curve; /* actual curve */
CurveMapPoint *table; /* display and evaluate table */
+
CurveMapPoint *premultable; /* for RGB curves, premulled table */
+ float premul_ext_in[2]; /* for RGB curves, premulled extrapolation vector */
+ float premul_ext_out[2];
} CurveMap;
/* cuma->flag */