diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-07-31 20:04:47 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-31 20:04:47 +0400 |
| commit | 4c02549d5d90c698946c6beb9df344c05e453158 (patch) | |
| tree | 12ad718582db598b16261832e38ff28c875aca0e /source/blender/compositor/operations/COM_MaskOperation.h | |
| parent | 2e5181195057b8e8525f2f91c107d6d67e2bdf3a (diff) | |
remove references to raskter from compositor and BKE mask.
Diffstat (limited to 'source/blender/compositor/operations/COM_MaskOperation.h')
| -rw-r--r-- | source/blender/compositor/operations/COM_MaskOperation.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/source/blender/compositor/operations/COM_MaskOperation.h b/source/blender/compositor/operations/COM_MaskOperation.h index 77d8e1148c2..859420bd650 100644 --- a/source/blender/compositor/operations/COM_MaskOperation.h +++ b/source/blender/compositor/operations/COM_MaskOperation.h @@ -21,14 +21,9 @@ * Sergey Sharybin */ - #ifndef _COM_MaskOperation_h #define _COM_MaskOperation_h -/* XXX, remove when the USE_RASKTER option is also removed */ -extern "C" { - #include "BKE_mask.h" -} #include "COM_NodeOperation.h" #include "DNA_scene_types.h" @@ -36,10 +31,6 @@ extern "C" { #include "BLI_listbase.h" #include "IMB_imbuf_types.h" -#ifdef __PLX_RASKTER_MT__ -#include "../../../../intern/raskter/raskter.h" -#endif - /** * Class with implementation of mask rasterization */ @@ -60,15 +51,8 @@ protected: bool m_do_smooth; bool m_do_feather; -#ifdef USE_RASKTER - float *m_rasterizedMask; - - ListBase m_maskLayers; - -#else /* USE_RASKTER */ struct MaskRasterHandle *m_rasterMaskHandles[32]; unsigned int m_rasterMaskHandleTot; -#endif /* USE_RASKTER */ /** * Determine the output resolution. The resolution is retrieved from the Renderer @@ -100,12 +84,7 @@ public: void setMotionBlurSamples(int samples) { this->m_rasterMaskHandleTot = max(1, samples); } void setMotionBlurShutter(float shutter) { this->m_frame_shutter = shutter; } -#ifdef USE_RASKTER - void *initializeTileData(rcti *rect); - void executePixel(float *color, int x, int y, void *data); -#else /* USE_RASKTER */ void executePixel(float *color, float x, float y, PixelSampler sampler); -#endif /* USE_RASKTER */ }; #endif |