[Bf-blender-cvs] [7c9b5523ff4] master: Fix T73482: Context Menu on any button is broken

Julian Eisel noreply at git.blender.org
Wed Jan 29 11:23:15 CET 2020


Commit: 7c9b5523ff4c4f392d495d06eb9b8a0b2ca5da3f
Author: Julian Eisel
Date:   Wed Jan 29 11:11:55 2020 +0100
Branches: master
https://developer.blender.org/rB7c9b5523ff4c4f392d495d06eb9b8a0b2ca5da3f

Fix T73482: Context Menu on any button is broken

What I removed here used to be needed in an earlier version of the
patch, to avoid use-after-frees. This is not the case anymore, so it
seems we can remove this.

Generally the context region code is very weak and inconsistent. If
things were done properly, the line I added shouldn't cause issues -
it's logically correct.

Also fixes T73475.

===================================================================

M	source/blender/editors/screen/screen_edit.c

===================================================================

diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 95293a23c26..501c36286d0 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -558,9 +558,6 @@ void ED_region_exit(bContext *C, ARegion *ar)
   WM_msgbus_clear_by_owner(wm->message_bus, ar);
 
   CTX_wm_region_set(C, prevar);
-  if (CTX_wm_menu(C) == ar) {
-    CTX_wm_region_set(C, NULL);
-  }
 }
 
 void ED_area_exit(bContext *C, ScrArea *sa)



More information about the Bf-blender-cvs mailing list