blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Merge branch 'blender-v3.1-release'

This commit is contained in:
Sergey Sharybin 2022-02-10 10:48:06 +01:00
parent e6ad11f06d 5312cf50a1
commit 8c18b16829
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/compositor/operations/COM_TextureOperation.cc
View File

@ -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];

12
source/blender/draw/engines/image/image_partial_updater.hh
View File

@ -32,11 +32,11 @@ struct PartialImageUpdater {
/**
* \brief Ensure that there is a partial update user for the given image.
*/
void ensure_image(const Image *image)
void ensure_image(const Image *new_image)
{
if (!is_valid(image)) {
if (!is_valid(new_image)) {
free();
create(image);
create(new_image);
}
}
@ -60,11 +60,11 @@ struct PartialImageUpdater {
return user != nullptr;
}
void create(const Image *image)
void create(const Image *new_image)
{
BLI_assert(user == nullptr);
user = BKE_image_partial_update_create(image);
image = image;
user = BKE_image_partial_update_create(new_image);
image = new_image;
}
void free()