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-08-01 16:59:38 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-08-01 16:59:38 +0400
commite00c7558bd30a087f4ffcb5197ec25a72fa76db5 (patch)
treeca66c0841fe14f8a799687e95f87b45f4206cfb6 /source/blender/compositor/operations/COM_MaskOperation.h
parentda4d468e989f713340a60639f0e67e9de88bc679 (diff)
- disable mask drawing in the sequencer, this isn't usable yet and likely wont be working in release.
- use define for max mask mblur samples, increase to 64 max.
Diffstat (limited to 'source/blender/compositor/operations/COM_MaskOperation.h')
-rw-r--r--source/blender/compositor/operations/COM_MaskOperation.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_MaskOperation.h b/source/blender/compositor/operations/COM_MaskOperation.h
index 859420bd650..ac864c9e131 100644
--- a/source/blender/compositor/operations/COM_MaskOperation.h
+++ b/source/blender/compositor/operations/COM_MaskOperation.h
@@ -51,7 +51,7 @@ protected:
bool m_do_smooth;
bool m_do_feather;
- struct MaskRasterHandle *m_rasterMaskHandles[32];
+ struct MaskRasterHandle *m_rasterMaskHandles[CMP_NODE_MASK_MBLUR_SAMPLES_MAX];
unsigned int m_rasterMaskHandleTot;
/**
@@ -81,7 +81,7 @@ public:
void setSmooth(bool smooth) { this->m_do_smooth = smooth; }
void setFeather(bool feather) { this->m_do_feather = feather; }
- void setMotionBlurSamples(int samples) { this->m_rasterMaskHandleTot = max(1, samples); }
+ void setMotionBlurSamples(int samples) { this->m_rasterMaskHandleTot = min(max(1, samples), CMP_NODE_MASK_MBLUR_SAMPLES_MAX); }
void setMotionBlurShutter(float shutter) { this->m_frame_shutter = shutter; }
void executePixel(float *color, float x, float y, PixelSampler sampler);