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>2013-07-22 23:59:07 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-07-22 23:59:07 +0400
commit3f53c33d4abd1dfb3bc32e96fce83d7bbe63b902 (patch)
tree7abfdb6325368e8deed24c2e1d761a8d9c35e021 /source/blender/compositor/intern/COM_SocketReader.h
parent6e98932e90df7575f371f492f31b0f7f9da713fa (diff)
fix [#36248] Crash using factor input on color mix node.
Diffstat (limited to 'source/blender/compositor/intern/COM_SocketReader.h')
-rw-r--r--source/blender/compositor/intern/COM_SocketReader.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/compositor/intern/COM_SocketReader.h b/source/blender/compositor/intern/COM_SocketReader.h
index 88b018ef8ba..b7aae8b92f0 100644
--- a/source/blender/compositor/intern/COM_SocketReader.h
+++ b/source/blender/compositor/intern/COM_SocketReader.h
@@ -91,13 +91,13 @@ protected:
virtual void executePixel(float output[4], float x, float y, float dx, float dy, PixelSampler sampler) {}
public:
- inline void read(float *result, float x, float y, PixelSampler sampler) {
+ inline void read(float result[4], float x, float y, PixelSampler sampler) {
executePixel(result, x, y, sampler);
}
- inline void read(float *result, int x, int y, void *chunkData) {
+ inline void read(float result[4], int x, int y, void *chunkData) {
executePixel(result, x, y, chunkData);
}
- inline void read(float *result, float x, float y, float dx, float dy, PixelSampler sampler) {
+ inline void read(float result[4], float x, float y, float dx, float dy, PixelSampler sampler) {
executePixel(result, x, y, dx, dy, sampler);
}