[Bf-blender-cvs] [58cc8938e16] master: Fix T83309: Hide metadata when overlays are off.
Jeroen Bakker
noreply at git.blender.org
Wed Dec 2 16:20:35 CET 2020
Commit: 58cc8938e16acb13380dc345c859848bb1b3d34c
Author: Jeroen Bakker
Date: Wed Dec 2 16:19:15 2020 +0100
Branches: master
https://developer.blender.org/rB58cc8938e16acb13380dc345c859848bb1b3d34c
Fix T83309: Hide metadata when overlays are off.
Inconsistency between overlay popover and implementation. Now the
metadata will not be visible when the overlays are turned off.
===================================================================
M source/blender/editors/space_image/space_image.c
===================================================================
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index 749e61955d9..9a36c88f6d1 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -659,7 +659,7 @@ static void image_main_region_draw(const bContext *C, ARegion *region)
/* Draw Meta data of the image isn't added to the DrawManager as it is
* used in other areas as well. */
- if (sima->flag & SI_DRAW_METADATA) {
+ if (sima->overlay.flag & SI_OVERLAY_SHOW_OVERLAYS && sima->flag & SI_DRAW_METADATA) {
void *lock;
/* `ED_space_image_get_zoom` temporarily locks the image, so this needs to be done before
* the image is locked when calling `ED_space_image_acquire_buffer`. */
More information about the Bf-blender-cvs
mailing list