Merge branch 'blender-v2.90-release'
This commit is contained in:
commit
ec5f392087
Notes:
blender-bot
2023-02-14 04:46:12 +01:00
Referenced by issue #79737, ERROR ACCESS VIOLATION when switching to evee rendered view
|
@ -217,7 +217,6 @@ wmKeyMap *WM_keymap_guess_opname(const bContext *C, const char *opname)
|
|||
* FLUID_OT
|
||||
* TEXTURE_OT
|
||||
* UI_OT
|
||||
* VIEW2D_OT
|
||||
* WORLD_OT
|
||||
*/
|
||||
|
||||
|
@ -344,6 +343,10 @@ wmKeyMap *WM_keymap_guess_opname(const bContext *C, const char *opname)
|
|||
break;
|
||||
}
|
||||
}
|
||||
/* General 2D View, not bound to a specific spacetype. */
|
||||
else if (STRPREFIX(opname, "VIEW2D_OT")) {
|
||||
km = WM_keymap_find_all(wm, "View2D", 0, 0);
|
||||
}
|
||||
/* Image Editor */
|
||||
else if (STRPREFIX(opname, "IMAGE_OT")) {
|
||||
km = WM_keymap_find_all(wm, "Image", sl->spacetype, 0);
|
||||
|
|
Loading…
Reference in New Issue