From de28e1da320fab72bf0fa1334a20202024b2525b Mon Sep 17 00:00:00 2001
From: Vilem Duha <vilem.duha@gmail.com>
Date: Wed, 28 Jul 2021 09:21:49 +0200
Subject: [PATCH] BlenderKit: fix asset bar not closing on drag drop
---
blenderkit/ui.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/blenderkit/ui.py b/blenderkit/ui.py
index 138f4a89f..bf6ea5463 100644
--- a/blenderkit/ui.py
+++ b/blenderkit/ui.py
@@ -1776,6 +1776,8 @@ class AssetDragOperator(bpy.types.Operator):
(abs(self.start_mouse_x - self.mouse_x) > drag_threshold or \
abs(self.start_mouse_y - self.mouse_y) > drag_threshold):
self.drag = True
+
+ if self.drag and ui_props.assetbar_on:
# turn off asset bar here, shout start again after finishing drag drop.
ui_props.turn_off = True
@@ -1819,7 +1821,7 @@ class AssetDragOperator(bpy.types.Operator):
if ui_props.asset_type == 'MODEL':
self.snapped_bbox_min = Vector(self.asset_data['bbox_min'])
self.snapped_bbox_max = Vector(self.asset_data['bbox_max'])
- return {'RUNNING_MODAL'}
+ #return {'RUNNING_MODAL'}
if event.type == 'LEFTMOUSE' and event.value == 'RELEASE':
self.mouse_release() # does the main job with assets
@@ -1829,8 +1831,13 @@ class AssetDragOperator(bpy.types.Operator):
bpy.ops.object.run_assetbar_fix_context(keep_running=True, do_search=False)
ui_props.dragging = False
return {'FINISHED'}
+
self.steps += 1
+ #pass event to assetbar so it can close itself
+ if ui_props.assetbar_on and ui_props.turn_off:
+ return {'PASS_THROUGH'}
+
return {'RUNNING_MODAL'}
def invoke(self, context, event):
--
GitLab