Revert "BlenderKit: check timers registration"

This reverts commit d6fb9fd957.
This commit is contained in:
Vilém Duha 2019-11-10 19:46:24 +01:00
parent 74a8fb2aa8
commit d1f254de55
5 changed files with 5 additions and 26 deletions

View File

@ -91,17 +91,6 @@ def scene_load(context):
preferences = bpy.context.preferences.addons['blenderkit'].preferences
preferences.login_attempt = False
def check_timers_timer():
''' checks if all timers are registered regularly. Prevents possible bugs from stopping the addon.'''
if not bpy.app.timers.is_registered(search.timer_update):
bpy.app.timers.register(search.timer_update)
if not bpy.app.timers.is_registered(download.timer_update):
bpy.app.timers.register(download.timer_update)
if not (bpy.app.timers.is_registered(tasks_queue.queue_worker)):
bpy.app.timers.register(tasks_queue.queue_worker)
if not bpy.app.timers.is_registered(bg_blender.bg_update):
bpy.app.timers.register(bg_blender.bg_update)
return 5.0
licenses = (
('royalty_free', 'Royalty Free', 'royalty free commercial license'),
@ -1492,15 +1481,10 @@ def register():
bkit_oauth.register()
tasks_queue.register()
bpy.app.timers.register(check_timers_timer)
bpy.app.handlers.load_post.append(scene_load)
def unregister():
bpy.app.timers.unregister(check_timers_timer)
ui.unregister_ui()
search.unregister_search()
asset_inspector.unregister_asset_inspector()

View File

@ -237,6 +237,5 @@ def register():
def unregister():
bpy.utils.unregister_class(KillBgProcess)
if bpy.app.timers.is_registered(bg_update):
bpy.app.timers.unregister(bg_update)
bpy.app.timers.unregister(bg_update)

View File

@ -928,5 +928,4 @@ def unregister_download():
bpy.utils.unregister_class(BlenderkitKillDownloadOperator)
bpy.app.handlers.load_post.remove(scene_load)
bpy.app.handlers.save_pre.remove(scene_save)
if bpy.app.timers.is_registered(timer_update):
bpy.app.timers.unregister(timer_update)
bpy.app.timers.unregister(timer_update)

View File

@ -1173,6 +1173,6 @@ def unregister_search():
for c in classes:
bpy.utils.unregister_class(c)
if bpy.app.timers.is_registered(timer_update):
bpy.app.timers.unregister(timer_update)
bpy.app.timers.unregister(timer_update)

View File

@ -29,9 +29,8 @@ if "bpy" in locals():
download = importlib.reload(download)
bg_blender = importlib.reload(bg_blender)
colors = importlib.reload(colors)
tasks_queue = importlib.reload(tasks_queue)
else:
from blenderkit import paths, ratings, utils, search, upload, ui_bgl, download, bg_blender, colors, tasks_queue
from blenderkit import paths, ratings, utils, search, upload, ui_bgl, download, bg_blender, colors
import bpy
@ -1152,8 +1151,6 @@ def update_ui_size(area, region):
ui.rating_y = ui.bar_y - ui.bar_height
class AssetBarOperator(bpy.types.Operator):
'''runs search and displays the asset bar at the same time'''
bl_idname = "view3d.blenderkit_asset_bar"