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-07-31 20:04:47 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-07-31 20:04:47 +0400
commit4c02549d5d90c698946c6beb9df344c05e453158 (patch)
tree12ad718582db598b16261832e38ff28c875aca0e /source/blender/nodes
parent2e5181195057b8e8525f2f91c107d6d67e2bdf3a (diff)
remove references to raskter from compositor and BKE mask.
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_mask.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_mask.c b/source/blender/nodes/composite/nodes/node_composite_mask.c
index 5df8bdc0a85..f4cbd1b7f6f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_mask.c
+++ b/source/blender/nodes/composite/nodes/node_composite_mask.c
@@ -38,8 +38,6 @@
#include "node_composite_util.h"
-#include "../../../../intern/raskter/raskter.h"
-
/* **************** Translate ******************** */
static bNodeSocketTemplate cmp_node_mask_out[] = {
@@ -51,6 +49,7 @@ static void exec(void *data, bNode *node, bNodeStack **UNUSED(in), bNodeStack **
{
if (node->id) {
Mask *mask = (Mask *)node->id;
+ MaskRasterHandle *mr_handle;
CompBuf *stackbuf;
RenderData *rd = data;
float *res;
@@ -70,13 +69,17 @@ static void exec(void *data, bNode *node, bNodeStack **UNUSED(in), bNodeStack **
stackbuf = alloc_compbuf(sx, sy, CB_VAL, TRUE);
res = stackbuf->rect;
- BKE_mask_rasterize(mask, sx, sy, res, TRUE,
- (node->custom1 & CMP_NODEFLAG_MASK_AA) != 0,
- (node->custom1 & CMP_NODEFLAG_MASK_NO_FEATHER) == 0);
+ /* mask raster begin */
+ mr_handle = BKE_maskrasterize_handle_new();
+ BKE_maskrasterize_handle_init(mr_handle, mask,
+ sx, sy,
+ TRUE,
+ (node->custom1 & CMP_NODEFLAG_MASK_AA) != 0,
+ (node->custom1 & CMP_NODEFLAG_MASK_NO_FEATHER) == 0);
+ BKE_maskrasterize_buffer(mr_handle, sx, sy, res);
+ BKE_maskrasterize_handle_free(mr_handle);
+ /* mask raster end */
- if (node->custom1) {
- PLX_antialias_buffer(res,sx,sy);
- }
/* pass on output and free */
out[0]->data = stackbuf;
}