[Bf-blender-cvs] [c29bc618292] master: Color management: Avoid memory copy into same buffer
Sergey Sharybin
noreply at git.blender.org
Wed Apr 12 10:24:12 CEST 2017
Commit: c29bc618292cb36fc13b197e6af4d5abd1a3ea11
Author: Sergey Sharybin
Date: Wed Apr 12 10:23:38 2017 +0200
Branches: master
https://developer.blender.org/rBc29bc618292cb36fc13b197e6af4d5abd1a3ea11
Color management: Avoid memory copy into same buffer
===================================================================
M source/blender/imbuf/intern/colormanagement.c
===================================================================
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c
index 48cba3e0800..0881a24422d 100644
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -1406,7 +1406,7 @@ static void *do_display_buffer_apply_thread(void *handle_v)
bool is_data = handle->is_data;
if (cm_processor == NULL) {
- if (display_buffer_byte) {
+ if (display_buffer_byte && display_buffer_byte != handle->byte_buffer) {
IMB_buffer_byte_from_byte(display_buffer_byte, handle->byte_buffer, IB_PROFILE_SRGB, IB_PROFILE_SRGB,
false, width, height, width, width);
}
More information about the Bf-blender-cvs
mailing list