[Bf-blender-cvs] [3788003cdae] blender-v3.0-release: Fix T93368: Dragging Blends Without Previews

Harley Acheson noreply at git.blender.org
Tue Nov 30 15:40:52 CET 2021


Commit: 3788003cdaeba4fb2b6dee5737c13412bf2d259a
Author: Harley Acheson
Date:   Tue Nov 30 15:37:10 2021 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rB3788003cdaeba4fb2b6dee5737c13412bf2d259a

Fix T93368: Dragging Blends Without Previews

Unfortunately the drop logic for file-path based drag & drop checks the
used icon for its logic. This is very bad and should be changed. But
doing this involves some changes that are better not done during bcon4,
so for now stick to it and update the icon check.

Reviewed by: Julian Eisel

Differential Revision: https://developer.blender.org/D13383?id=45314

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

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

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

diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 66140cba9c6..220697f465e 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -5778,7 +5778,7 @@ static void keymap_modal_set(wmKeyConfig *keyconf)
 static bool blend_file_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event))
 {
   if (drag->type == WM_DRAG_PATH) {
-    if (drag->icon == ICON_FILE_BLEND) {
+    if (ELEM(drag->icon, ICON_FILE_BLEND, ICON_BLENDER)) {
       return true;
     }
   }



More information about the Bf-blender-cvs mailing list