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:
authorSergey Sharybin <sergey@blender.org>2022-02-10 12:48:06 +0300
committerSergey Sharybin <sergey@blender.org>2022-02-10 12:48:06 +0300
commit8c18b16829bf22c7783c8e94002471211bbbbf24 (patch)
tree4af6ec8dec3284de5961d2e7cc8b57b51d5fb511 /source/blender/compositor
parente6ad11f06dd7875c66b1c0a2bfabd2cd3eb1d8c7 (diff)
parent5312cf50a1f71f9baa63d516f1e5eef728339efb (diff)
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/operations/COM_TextureOperation.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/compositor/operations/COM_TextureOperation.cc b/source/blender/compositor/operations/COM_TextureOperation.cc
index 069d00b5e66..f0e661818f8 100644
--- a/source/blender/compositor/operations/COM_TextureOperation.cc
+++ b/source/blender/compositor/operations/COM_TextureOperation.cc
@@ -102,7 +102,7 @@ void TextureBaseOperation::execute_pixel_sampled(float output[4],
float y,
PixelSampler sampler)
{
- TexResult texres = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, nullptr};
+ TexResult texres = {0.0f};
float texture_size[4];
float texture_offset[4];
float vec[3];