[Bf-blender-cvs] [8f02de3de7b] master: Cleanup: remove redundant variable
Germano Cavalcante
noreply at git.blender.org
Wed Oct 27 23:19:45 CEST 2021
Commit: 8f02de3de7b77af82d75b9b10e5d0fa20034650c
Author: Germano Cavalcante
Date: Wed Oct 27 18:11:47 2021 -0300
Branches: master
https://developer.blender.org/rB8f02de3de7b77af82d75b9b10e5d0fa20034650c
Cleanup: remove redundant variable
`free_tooltip` is no longer needed.
===================================================================
M source/blender/windowmanager/intern/wm_dragdrop.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_dragdrop.c b/source/blender/windowmanager/intern/wm_dragdrop.c
index 37a101cc31d..b9f0e09d106 100644
--- a/source/blender/windowmanager/intern/wm_dragdrop.c
+++ b/source/blender/windowmanager/intern/wm_dragdrop.c
@@ -819,11 +819,9 @@ static void wm_drag_draw_tooltip(bContext *C, wmWindow *win, wmDrag *drag, const
int iconsize = UI_DPI_ICON_SIZE;
int padding = 4 * UI_DPI_FAC;
- const char *tooltip = NULL;
- bool free_tooltip = false;
+ char *tooltip = NULL;
if (drag->active_dropbox) {
tooltip = dropbox_tooltip(C, drag, xy, drag->active_dropbox);
- free_tooltip = true;
}
if (!tooltip && !drag->disabled_info) {
@@ -855,9 +853,7 @@ static void wm_drag_draw_tooltip(bContext *C, wmWindow *win, wmDrag *drag, const
if (tooltip) {
wm_drop_operator_draw(tooltip, x, y);
- if (free_tooltip) {
- MEM_freeN((void *)tooltip);
- }
+ MEM_freeN(tooltip);
}
else if (drag->disabled_info) {
wm_drop_redalert_draw(drag->disabled_info, x, y);
More information about the Bf-blender-cvs
mailing list