fix: blender path import
This commit is contained in:
@ -202,8 +202,14 @@ classes = (
|
|||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
libs = os.path.dirname(os.path.abspath(__file__))+"\\libs\\replication"
|
||||||
|
|
||||||
def register():
|
def register():
|
||||||
|
|
||||||
|
if libs not in sys.path:
|
||||||
|
sys.path.append(libs)
|
||||||
|
print(libs)
|
||||||
|
|
||||||
environment.setup(DEPENDENCIES,bpy.app.binary_path_python)
|
environment.setup(DEPENDENCIES,bpy.app.binary_path_python)
|
||||||
|
|
||||||
from . import operators
|
from . import operators
|
||||||
|
Submodule libs/replication updated: c47fbd56c1...130845f74d
13
operators.py
13
operators.py
@ -16,7 +16,6 @@ from pathlib import Path
|
|||||||
|
|
||||||
from . import environment, presence, ui
|
from . import environment, presence, ui
|
||||||
from .libs import umsgpack
|
from .libs import umsgpack
|
||||||
from .libs.replication import client
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -58,7 +57,7 @@ def upload_client_instance_position():
|
|||||||
|
|
||||||
key = "Client/{}".format(username)
|
key = "Client/{}".format(username)
|
||||||
|
|
||||||
current_coords = draw.get_client_view_rect()
|
current_coords = presence.get_client_view_rect()
|
||||||
client_list = client.instance.get(key)
|
client_list = client.instance.get(key)
|
||||||
|
|
||||||
if current_coords and client_list:
|
if current_coords and client_list:
|
||||||
@ -162,7 +161,7 @@ class SessionJoinOperator(bpy.types.Operator):
|
|||||||
|
|
||||||
# Launch drawing module
|
# Launch drawing module
|
||||||
if net_settings.enable_presence:
|
if net_settings.enable_presence:
|
||||||
draw.renderer.run()
|
presence.renderer.run()
|
||||||
|
|
||||||
return {"FINISHED"}
|
return {"FINISHED"}
|
||||||
|
|
||||||
@ -290,7 +289,7 @@ class SessionStopOperator(bpy.types.Operator):
|
|||||||
net_settings.is_admin = False
|
net_settings.is_admin = False
|
||||||
|
|
||||||
unregister_ticks()
|
unregister_ticks()
|
||||||
draw.renderer.stop()
|
presence.renderer.stop()
|
||||||
else:
|
else:
|
||||||
logger.debug("No server/client_instance running.")
|
logger.debug("No server/client_instance running.")
|
||||||
|
|
||||||
@ -354,7 +353,7 @@ class SessionSnapUserOperator(bpy.types.Operator):
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
def execute(self, context):
|
def execute(self, context):
|
||||||
area, region, rv3d = draw.view3d_find()
|
area, region, rv3d = presence.view3d_find()
|
||||||
|
|
||||||
target_client = client.instance.get(
|
target_client = client.instance.get(
|
||||||
"Client/{}".format(self.target_client))
|
"Client/{}".format(self.target_client))
|
||||||
@ -521,13 +520,13 @@ def register():
|
|||||||
register_class(cls)
|
register_class(cls)
|
||||||
|
|
||||||
bpy.app.handlers.depsgraph_update_post.append(depsgraph_update)
|
bpy.app.handlers.depsgraph_update_post.append(depsgraph_update)
|
||||||
draw.register()
|
presence.register()
|
||||||
|
|
||||||
|
|
||||||
def unregister():
|
def unregister():
|
||||||
global server
|
global server
|
||||||
|
|
||||||
draw.unregister()
|
presence.unregister()
|
||||||
|
|
||||||
if bpy.app.handlers.depsgraph_update_post.count(depsgraph_update) > 0:
|
if bpy.app.handlers.depsgraph_update_post.count(depsgraph_update) > 0:
|
||||||
bpy.app.handlers.depsgraph_update_post.remove(depsgraph_update)
|
bpy.app.handlers.depsgraph_update_post.remove(depsgraph_update)
|
||||||
|
Reference in New Issue
Block a user