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:
authorJeroen Bakker <j.bakker@atmind.nl>2012-07-19 21:28:37 +0400
committerJeroen Bakker <j.bakker@atmind.nl>2012-07-19 21:28:37 +0400
commit579a4a02a54da01a4af98e831f4feb87fba72392 (patch)
treef76ce8079a2c5495ce40c47aecd8c48cab6a6c7e /source/blender/compositor/operations/COM_MaskOperation.h
parent2557eaf0dd33e3139cc6188b97029207686360bf (diff)
Possible fix for [#32141] Crash when using a mask as the factor input
for a color combine (mix) node with render resolution at 100% Seems to be that the MaskNode has been created as a complex node. But no complex features were used. Converted the execute pixel to simple execution. And it sees that the crash does not happen. Not sure if it is the issue is solved. I am going to let the user retest with this revision.
Diffstat (limited to 'source/blender/compositor/operations/COM_MaskOperation.h')
-rw-r--r--source/blender/compositor/operations/COM_MaskOperation.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/compositor/operations/COM_MaskOperation.h b/source/blender/compositor/operations/COM_MaskOperation.h
index d761ee58cb9..f367298b3d6 100644
--- a/source/blender/compositor/operations/COM_MaskOperation.h
+++ b/source/blender/compositor/operations/COM_MaskOperation.h
@@ -72,7 +72,6 @@ public:
void initExecution();
void deinitExecution();
- void *initializeTileData(rcti *rect);
void setMask(Mask *mask) { this->m_mask = mask; }
void setMaskWidth(int width) { this->m_maskWidth = width; }
@@ -81,7 +80,12 @@ public:
void setSmooth(bool smooth) { this->m_do_smooth = smooth; }
void setFeather(bool feather) { this->m_do_feather = feather; }
+#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