Commit: 4b9c77a19aa359b5ab4b86e05cff1c8627d05a1e
Author: Jacques Lucke
Date: Tue Mar 1 11:36:46 2022 +0100
Branches: master
https://developer.blender.org/rB4b9c77a19aa359b5ab4b86e05cff1c8627d05a1e
Merge branch 'blender-v3.1-release'
===================================================================
===================================================================
diff --cc source/blender/draw/engines/image/image_drawing_mode.hh
index b9de0838fef,267b0477a29..c727fbcd98f
--- a/source/blender/draw/engines/image/image_drawing_mode.hh
+++ b/source/blender/draw/engines/image/image_drawing_mode.hh
@@@ -373,19 -419,15 +403,15 @@@ template<typename TextureMethod> class
*
* Returns true when a float buffer was created. Somehow the VSE cache
increases the ref
* counter, but might use a different mechanism for destructing the image,
that doesn't free the
- * rect_float as the refcounter isn't 0. To work around this we destruct
any created local
+ * rect_float as the reference-counter isn't 0. To work around this we
destruct any created local
* buffers ourself.
*/
- bool ensure_float_buffer(ImBuf &image_buffer) const
+ ImBuf *ensure_float_buffer(IMAGE_InstanceData &instance_data, ImBuf
*image_buffer) const
{
- if (image_buffer.rect_float == nullptr) {
- IMB_float_from_rect(&image_buffer);
- return true;
- }
- return false;
+ return instance_data.float_buffers.ensure_float_buffer(image_buffer);
}
- void do_full_update_texture_slot(const IMAGE_InstanceData &instance_data,
+ void do_full_update_texture_slot(IMAGE_InstanceData &instance_data,
const TextureInfo &texture_info,
ImBuf &texture_buffer,
ImBuf &tile_buffer,
_______________________________________________
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
