Commit: 612555121c605c07c5319e4de74821e63dba6fef Author: Jeroen Bakker Date: Fri May 6 09:06:52 2022 +0200 Branches: temp-image-engine-float-cache https://developer.blender.org/rB612555121c605c07c5319e4de74821e63dba6fef
Merge branch 'blender-v3.2-release' into temp-image-engine-float-cache =================================================================== =================================================================== diff --cc source/blender/draw/engines/image/image_drawing_mode.hh index ad0d5cd16ca,a1cd110e1d8..3a3af0f138e --- a/source/blender/draw/engines/image/image_drawing_mode.hh +++ b/source/blender/draw/engines/image/image_drawing_mode.hh @@@ -154,16 -154,15 +154,15 @@@ template<typename TextureMethod> class * bug or a feature. For now we just acquire to determine if there is a texture. */ void *lock; ImBuf *tile_buffer = BKE_image_acquire_ibuf(image, &tile_user, &lock); - if (tile_buffer == nullptr) { - continue; + if (tile_buffer != nullptr) { - instance_data.float_buffers.mark_used(tile_buffer); ++ IMAGE_buffer_cache_mark_used(tile_buffer); + + DRWShadingGroup *shsub = DRW_shgroup_create_sub(shgrp); + float4 min_max_uv(tile_x, tile_y, tile_x + 1, tile_y + 1); + DRW_shgroup_uniform_vec4_copy(shsub, "min_max_uv", min_max_uv); + DRW_shgroup_call_obmat(shsub, info.batch, image_mat); } - IMAGE_buffer_cache_mark_used(tile_buffer); BKE_image_release_ibuf(image, tile_buffer, lock); - - DRWShadingGroup *shsub = DRW_shgroup_create_sub(shgrp); - float4 min_max_uv(tile_x, tile_y, tile_x + 1, tile_y + 1); - DRW_shgroup_uniform_vec4_copy(shsub, "min_max_uv", min_max_uv); - DRW_shgroup_call_obmat(shsub, info.batch, image_mat); } } } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs