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

Merge branch 'blender-v3.0-release'

This commit is contained in:
Brecht Van Lommel 2021-12-02 16:43:25 +01:00
parent aec56e562a 7e60d8a713
commit e6a732daad
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
intern/cycles/blender/image.cpp
View File

@ -24,8 +24,14 @@ CCL_NAMESPACE_BEGIN
/* Packed Images */
BlenderImageLoader::BlenderImageLoader(BL::Image b_image, int frame)
: b_image(b_image), frame(frame), free_cache(!b_image.has_data())
BlenderImageLoader::BlenderImageLoader(BL::Image b_image,
const int frame,
const bool is_preview_render)
: b_image(b_image),
frame(frame),
/* Don't free cache for preview render to avoid race condition from T93560, to be fixed
properly later as we are close to release. */
free_cache(!is_preview_render && !b_image.has_data())
{
}

2
intern/cycles/blender/image.h
View File

@ -25,7 +25,7 @@ CCL_NAMESPACE_BEGIN
class BlenderImageLoader : public ImageLoader {
public:
BlenderImageLoader(BL::Image b_image, int frame);
BlenderImageLoader(BL::Image b_image, const int frame, const bool is_preview_render);
bool load_metadata(const ImageDeviceFeatures &features, ImageMetaData &metadata) override;
bool load_pixels(const ImageMetaData &metadata,

8
intern/cycles/blender/shader.cpp
View File

@ -762,7 +762,8 @@ static ShaderNode *add_node(Scene *scene,
int scene_frame = b_scene.frame_current();
int image_frame = image_user_frame_number(b_image_user, b_image, scene_frame);
image->handle = scene->image_manager->add_image(
new BlenderImageLoader(b_image, image_frame), image->image_params());
new BlenderImageLoader(b_image, image_frame, b_engine.is_preview()),
image->image_params());
}
else {
ustring filename = ustring(
@ -797,8 +798,9 @@ static ShaderNode *add_node(Scene *scene,
if (is_builtin) {
int scene_frame = b_scene.frame_current();
int image_frame = image_user_frame_number(b_image_user, b_image, scene_frame);
env->handle = scene->image_manager->add_image(new BlenderImageLoader(b_image, image_frame),
env->image_params());
env->handle = scene->image_manager->add_image(
new BlenderImageLoader(b_image, image_frame, b_engine.is_preview()),
env->image_params());
}
else {
env->set_filename(

2
release/windows/msix/AppxManifest.xml.template
View File

@ -5,7 +5,7 @@
<DisplayName>Blender[LTSORNOT]</DisplayName>
<PublisherDisplayName>Blender Foundation</PublisherDisplayName>
<Description>Blender [VERSION] is the Free and Open Source 3D creation suite</Description>
<Logo>Assets\StoreLogo.png</Logo>
<Logo>Assets\StoreLogo.scale-100.png</Logo>
</Properties>
<Resources>
<Resource Language="en-us" />