Backups/multi-user
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: threaded loading back

Browse Source
This commit is contained in:
Swann
2019-07-08 23:24:08 +02:00
parent 7cf0f20ffb
commit bb16dc9524
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
__init__.py
View File

@ -207,6 +207,7 @@ classes = (
def load_handler(dummy): def load_handler(dummy):
import bpy import bpy
bpy.context.window_manager.session.load() bpy.context.window_manager.session.load()
save_session_config(bpy.context.window_manager.session,bpy.context)
def register(): def register():
@ -225,7 +226,7 @@ def register():
bpy.app.handlers.load_post.append(load_handler) bpy.app.handlers.load_post.append(load_handler)
save_session_config(bpy.context.window_manager.session,bpy.context)
operators.register() operators.register()
ui.register() ui.register()

9
client.py
View File

@ -416,10 +416,11 @@ def net_worker(ctx, store, pipe, serial_product, serial_feed, stop_event,externa
msg.store(agent.property_map) msg.store(agent.property_map)
params = [] # params = []
params.append(msg.key) # params.append(msg.key)
params.append(msg.body) # params.append(msg.body)
external_executor.put((helpers.load,params)) # external_executor.put((helpers.load,params))
net_product.put(('LOAD', msg.key, msg.body))
# Serialisation thread => Net thread # Serialisation thread => Net thread
if not net_feed.empty(): if not net_feed.empty():

2
helpers.py
View File

@ -483,7 +483,7 @@ def load_material(target=None, data=None, create=False):
target.node_tree.nodes.new(type=node_type) target.node_tree.nodes.new(type=node_type)
dump_anything.load( dump_anything.load(
target.node_tree.nodes[index], data["node_tree"]["nodes"][node]) target.node_tree.nodes[index], data["node_tree"]["nodes"][node])
if data["node_tree"]["nodes"][node]['type'] == 'TEX_IMAGE': if data["node_tree"]["nodes"][node]['type'] == 'TEX_IMAGE':