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-26 17:29:38 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-07-26 17:29:38 +0400
commit733edf86284d83dd0a70da59228b0c0d39c8cbfa (patch)
treed4f6bba86fc3d9d03f26edc08627d5c844f96ab3 /source/blender/compositor/operations/COM_MaskOperation.cpp
parent2b8fdedaf3e67115aef18bce9be3c2a35399e0f7 (diff)
option to use manual size input for scene
Diffstat (limited to 'source/blender/compositor/operations/COM_MaskOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_MaskOperation.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/compositor/operations/COM_MaskOperation.cpp b/source/blender/compositor/operations/COM_MaskOperation.cpp
index c648f3e6f08..5e68142bda3 100644
--- a/source/blender/compositor/operations/COM_MaskOperation.cpp
+++ b/source/blender/compositor/operations/COM_MaskOperation.cpp
@@ -145,12 +145,11 @@ void MaskOperation::initExecution()
{
if (this->m_mask) {
if (this->m_rasterMaskHandle == NULL) {
- const int width = this->getWidth();
- const int height = this->getHeight();
-
this->m_rasterMaskHandle = BKE_maskrasterize_handle_new();
- BKE_maskrasterize_handle_init(this->m_rasterMaskHandle, this->m_mask, width, height, TRUE, this->m_do_smooth, this->m_do_feather);
+ BKE_maskrasterize_handle_init(this->m_rasterMaskHandle, this->m_mask,
+ this->m_maskWidth, this->m_maskHeight,
+ TRUE, this->m_do_smooth, this->m_do_feather);
}
}
}
@@ -183,8 +182,8 @@ void MaskOperation::determineResolution(unsigned int resolution[], unsigned int
void MaskOperation::executePixel(float *color, float x, float y, PixelSampler sampler)
{
- const float xy[2] = {x / (float)this->m_maskWidth, y / (float)this->m_maskHeight};
if (this->m_rasterMaskHandle) {
+ const float xy[2] = {x * this->m_maskWidthInv, y * this->m_maskHeightInv};
color[0] = BKE_maskrasterize_handle_sample(this->m_rasterMaskHandle, xy);
}
else {