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:
authorCampbell Barton <ideasman42@gmail.com>2012-06-12 22:36:49 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-12 22:36:49 +0400
commit16dededdf399b0fcb62f8e062d2877873ed52b34 (patch)
tree7565ba08d29f9db630217e35822c71288ee44cb6 /source/blender/blenkernel
parentca6290228f63490b777d7862ce50f537e604ab75 (diff)
remove input socket of mask node, this wasnt used.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/BKE_mask.h2
-rw-r--r--source/blender/blenkernel/intern/mask.c22
-rw-r--r--source/blender/blenkernel/intern/sequencer.c4
3 files changed, 5 insertions, 23 deletions
diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h
index ec2eb82a9eb..345a2190e89 100644
--- a/source/blender/blenkernel/BKE_mask.h
+++ b/source/blender/blenkernel/BKE_mask.h
@@ -169,7 +169,7 @@ void BKE_mask_layer_shape_changed_remove(struct MaskLayer *masklay, int index, i
/* rasterization */
int BKE_mask_get_duration(struct Mask *mask);
void BKE_mask_rasterize(struct Mask *mask, int width, int height, float *buffer,
- const short do_aspect_correct, const short do_linear);
+ const short do_aspect_correct);
#define MASKPOINT_ISSEL_ANY(p) ( ((p)->bezt.f1 | (p)->bezt.f2 | (p)->bezt.f2) & SELECT)
#define MASKPOINT_ISSEL_KNOT(p) ( (p)->bezt.f2 & SELECT)
diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c
index bb2940091e4..a28ff3a175d 100644
--- a/source/blender/blenkernel/intern/mask.c
+++ b/source/blender/blenkernel/intern/mask.c
@@ -2061,19 +2061,6 @@ static void m_invert_vn_vn(float *array, const float f, const int size)
}
}
-static void clamp_vn_vn_linear(float *array, const int size)
-{
- float *arr = array + (size - 1);
-
- int i = size;
- while (i--) {
- if (*arr <= 0.0f) *arr = 0.0f;
- else if (*arr >= 1.0f) *arr = 1.0f;
- else *arr = srgb_to_linearrgb(*arr);
- arr--;
- }
-}
-
static void clamp_vn_vn(float *array, const int size)
{
float *arr = array + (size - 1);
@@ -2093,7 +2080,7 @@ int BKE_mask_get_duration(Mask *mask)
/* rasterization */
void BKE_mask_rasterize(Mask *mask, int width, int height, float *buffer,
- const short do_aspect_correct, const short do_linear)
+ const short do_aspect_correct)
{
MaskLayer *masklay;
@@ -2213,12 +2200,7 @@ void BKE_mask_rasterize(Mask *mask, int width, int height, float *buffer,
}
/* clamp at the end */
- if (do_linear) {
- clamp_vn_vn_linear(buffer, buffer_size);
- }
- else {
- clamp_vn_vn(buffer, buffer_size);
- }
+ clamp_vn_vn(buffer, buffer_size);
}
MEM_freeN(buffer_tmp);
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index af5b7716bbc..889eee25d6b 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -2081,7 +2081,7 @@ static ImBuf *seq_render_mask_strip(
BKE_mask_rasterize(seq->mask,
context.rectx, context.recty,
maskbuf,
- TRUE, FALSE);
+ TRUE);
fp_src = maskbuf;
fp_dst = ibuf->rect_float;
@@ -2104,7 +2104,7 @@ static ImBuf *seq_render_mask_strip(
BKE_mask_rasterize(seq->mask,
context.rectx, context.recty,
maskbuf,
- TRUE, FALSE);
+ TRUE);
fp_src = maskbuf;
ub_dst = (unsigned char *)ibuf->rect;